Replace transitional package names for Xenial

Some of the packages specified in the manifest have slightly
different names on Xenial than their Trusty era counterparts. In
some cases these were already dependencies of other packages we're
installing and were specified unnecessarily so we can just remove
them from the manifest. In some cases there are virtual packages
which match the old and new names so we can just use those instead
and ease future maintenance as well. In some cases the old package
name was actually a dummy transitional package already so using the
newer name works for both platforms.

Change-Id: Ib80fa6becffe4f76a9d14777d5c4a634ebaadb87
This commit is contained in:
Jeremy Stanley 2019-04-09 18:46:28 +00:00
parent a7956cd41d
commit dbfc8381c7
3 changed files with 7 additions and 8 deletions

View File

@ -17,6 +17,7 @@ class mediawiki::image_scaler {
'fonts-sil-abyssinica',
'fonts-sil-ezra',
'fonts-sil-padauk',
'fonts-sil-nuosusil',
'fonts-takao-gothic',
'fonts-takao-mincho',
'fonts-thai-tlwg',
@ -28,7 +29,6 @@ class mediawiki::image_scaler {
'librsvg2-bin',
'libtheora0',
'libvips-tools',
'libvips37',
'libvorbisenc2',
'netpbm',
'oggvideotools',
@ -46,7 +46,6 @@ class mediawiki::image_scaler {
'ttf-oriya-fonts',
'ttf-punjabi-fonts',
'ttf-sil-scheherazade',
'ttf-sil-yi',
'ttf-tamil-fonts',
'ttf-ubuntu-font-family',
'ttf-unfonts-extra',

View File

@ -31,7 +31,7 @@ class mediawiki(
if ($role == 'app' or $role == 'all') {
# This is equivalent to apache::dev which is not puppet3
# compatible with puppetlabs-apache 0.0.4:
package { ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']:
package { 'apache2-dev':
ensure => present,
}

View File

@ -1,13 +1,13 @@
# Class: mediawiki::php
#
class mediawiki::php {
package { ['php5',
'php5-cli',
'php5-mysql',
package { ['php',
'php-cli',
'php-mysql',
'php-apc',
'php5-intl',
'php-intl',
'php-openid',
'php5-memcached']:
'php-memcached']:
ensure => present,
}
# TODO: apc configuration