Ori.livneh has submitted this change and it was merged.
Change subject: mediawiki: add packages::fonts and packages::multimedia
......................................................................
mediawiki: add packages::fonts and packages::multimedia
Continue factoring out bunches of package dependencies into discrete subclasses
of mediawiki::packages.
Change-Id: I27e84f9286a4df60b0eb81a0cd31c13746851102
---
M modules/mediawiki/manifests/multimedia.pp
A modules/mediawiki/manifests/packages/fonts.pp
A modules/mediawiki/manifests/packages/multimedia.pp
M modules/toollabs/manifests/exec_environ.pp
4 files changed, 92 insertions(+), 83 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
coren: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/mediawiki/manifests/multimedia.pp
b/modules/mediawiki/manifests/multimedia.pp
index fff3b74..28e95bd 100644
--- a/modules/mediawiki/manifests/multimedia.pp
+++ b/modules/mediawiki/manifests/multimedia.pp
@@ -4,32 +4,8 @@
# and video processing.
#
class mediawiki::multimedia {
- include ::mediawiki::multimedia::fonts
-
- if ubuntu_version('>= trusty') {
- $libav_package = 'libav-tools'
- $libvips_package = 'libvips37'
- } else {
- $libav_package = 'ffmpeg'
- $libvips_package = 'libvips15'
- }
-
- package { [
- $libav_package,
- $libvips_package,
- 'ffmpeg2theora',
- 'fontconfig-config',
- 'ghostscript',
- 'libjpeg-turbo-progs',
- 'libogg0',
- 'libtheora0',
- 'libvips-tools',
- 'libvorbisenc2',
- 'netpbm',
- 'oggvideotools',
- ]:
- ensure => present,
- }
+ include ::mediawiki::packages::multimedia
+ include ::mediawiki::packages::fonts
file { '/etc/fonts/conf.d/70-no-bitmaps.conf':
ensure => link,
@@ -50,61 +26,5 @@
type => 'ctime',
backup => false,
recurse => 1,
- }
-}
-
-class mediawiki::multimedia::fonts {
- package { [
- 'fonts-arabeyes',
- 'fonts-arphic-ukai',
- 'fonts-arphic-uming',
- 'fonts-farsiweb',
- 'fonts-kacst',
- 'fonts-khmeros',
- 'fonts-lao',
- 'fonts-liberation',
- 'fonts-linuxlibertine',
- 'fonts-manchufont',
- 'fonts-mgopen',
- 'fonts-nafees',
- 'fonts-sil-abyssinica',
- 'fonts-sil-ezra',
- 'fonts-sil-padauk',
- 'fonts-sil-scheherazade',
- 'fonts-takao-gothic',
- 'fonts-takao-mincho',
- 'fonts-thai-tlwg',
- 'fonts-tibetan-machine',
- 'fonts-unfonts-extra',
- 'texlive-fonts-recommended',
- 'ttf-alee',
- 'ttf-bengali-fonts',
- 'ttf-devanagari-fonts',
- 'ttf-gujarati-fonts',
- 'ttf-kannada-fonts',
- 'ttf-malayalam-fonts',
- 'ttf-oriya-fonts',
- 'ttf-punjabi-fonts',
- 'ttf-tamil-fonts',
- 'ttf-telugu-fonts',
- 'ttf-ubuntu-font-family',
- 'ttf-wqy-zenhei',
- 'xfonts-100dpi',
- 'xfonts-75dpi',
- 'xfonts-base',
- 'xfonts-mplus',
- 'xfonts-scalable',
- 'fonts-sil-nuosusil', # RT 6500
- 'culmus', # Bug 38946
- 'culmus-fancy', # Bug 38946
- 'fonts-lklug-sinhala', # Bug 55462
- 'fonts-vlgothic', # Bug 64002
- 'ttf-dejavu-core', # Bug 63206
- 'ttf-dejavu-extra', # Bug 63206
- 'ttf-kochi-gothic', # Bug 64002
- 'ttf-kochi-mincho', # Bug 64002
- 'ttf-lyx', # Bug 38299
- ]:
- ensure => present,
}
}
diff --git a/modules/mediawiki/manifests/packages/fonts.pp
b/modules/mediawiki/manifests/packages/fonts.pp
new file mode 100644
index 0000000..5f1d152
--- /dev/null
+++ b/modules/mediawiki/manifests/packages/fonts.pp
@@ -0,0 +1,59 @@
+# == Class: mediawiki::packages::fonts
+#
+# Provisions font packages used by MediaWiki.
+#
+class mediawiki::packages::fonts {
+ package { [
+ 'fonts-arabeyes',
+ 'fonts-arphic-ukai',
+ 'fonts-arphic-uming',
+ 'fonts-farsiweb',
+ 'fonts-kacst',
+ 'fonts-khmeros',
+ 'fonts-lao',
+ 'fonts-liberation',
+ 'fonts-linuxlibertine',
+ 'fonts-manchufont',
+ 'fonts-mgopen',
+ 'fonts-nafees',
+ 'fonts-sil-abyssinica',
+ 'fonts-sil-ezra',
+ 'fonts-sil-padauk',
+ 'fonts-sil-scheherazade',
+ 'fonts-takao-gothic',
+ 'fonts-takao-mincho',
+ 'fonts-thai-tlwg',
+ 'fonts-tibetan-machine',
+ 'fonts-unfonts-extra',
+ 'texlive-fonts-recommended',
+ 'ttf-alee',
+ 'ttf-bengali-fonts',
+ 'ttf-devanagari-fonts',
+ 'ttf-gujarati-fonts',
+ 'ttf-kannada-fonts',
+ 'ttf-malayalam-fonts',
+ 'ttf-oriya-fonts',
+ 'ttf-punjabi-fonts',
+ 'ttf-tamil-fonts',
+ 'ttf-telugu-fonts',
+ 'ttf-ubuntu-font-family',
+ 'ttf-wqy-zenhei',
+ 'xfonts-100dpi',
+ 'xfonts-75dpi',
+ 'xfonts-base',
+ 'xfonts-mplus',
+ 'xfonts-scalable',
+ 'fonts-sil-nuosusil', # RT 6500
+ 'culmus', # Bug 38946
+ 'culmus-fancy', # Bug 38946
+ 'fonts-lklug-sinhala', # Bug 55462
+ 'fonts-vlgothic', # Bug 64002
+ 'ttf-dejavu-core', # Bug 63206
+ 'ttf-dejavu-extra', # Bug 63206
+ 'ttf-kochi-gothic', # Bug 64002
+ 'ttf-kochi-mincho', # Bug 64002
+ 'ttf-lyx', # Bug 38299
+ ]:
+ ensure => present,
+ }
+}
diff --git a/modules/mediawiki/manifests/packages/multimedia.pp
b/modules/mediawiki/manifests/packages/multimedia.pp
new file mode 100644
index 0000000..bb0604d
--- /dev/null
+++ b/modules/mediawiki/manifests/packages/multimedia.pp
@@ -0,0 +1,30 @@
+# == Class: mediawiki::packages::multimedia
+#
+# Provisions packages used by MediaWiki for image and video processing.
+#
+class mediawiki::packages::multimedia {
+ if ubuntu_version('>= trusty') {
+ $libav_package = 'libav-tools'
+ $libvips_package = 'libvips37'
+ } else {
+ $libav_package = 'ffmpeg'
+ $libvips_package = 'libvips15'
+ }
+
+ package { [
+ $libav_package,
+ $libvips_package,
+ 'ffmpeg2theora',
+ 'fontconfig-config',
+ 'ghostscript',
+ 'libjpeg-turbo-progs',
+ 'libogg0',
+ 'libtheora0',
+ 'libvips-tools',
+ 'libvorbisenc2',
+ 'netpbm',
+ 'oggvideotools',
+ ]:
+ ensure => present,
+ }
+}
diff --git a/modules/toollabs/manifests/exec_environ.pp
b/modules/toollabs/manifests/exec_environ.pp
index 20bbeed..f67fe56 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -18,7 +18,7 @@
class toollabs::exec_environ {
include generic::locales::international
include identd
- include mediawiki::multimedia::fonts
+ include ::mediawiki::packages::fonts
package { [
# Please keep all packages in each group sorted in alphabetical order
--
To view, visit https://gerrit.wikimedia.org/r/156842
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I27e84f9286a4df60b0eb81a0cd31c13746851102
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
