From 42f92653f7e6cf7ccc5cfb3b24608f5aa0c5662a Mon Sep 17 00:00:00 2001 From: Alex Monk Date: Sun, 7 Aug 2016 01:48:56 +0000 Subject: [PATCH] image_scaler: Partially separate packages for Trusty Change-Id: I95fa1ce6ccb1396a9e6420b89df64ca298fc6d2d --- manifests/image_scaler.pp | 63 ++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/manifests/image_scaler.pp b/manifests/image_scaler.pp index 5a0c44b..e57faf4 100644 --- a/manifests/image_scaler.pp +++ b/manifests/image_scaler.pp @@ -1,8 +1,53 @@ # Class: mediawiki::image_scaler # class mediawiki::image_scaler { + if $::lsbdistcodename == 'precise' { + package { [ + # TODO: This seems to have been copied from wikimedia's mediawiki::multimedia, + # and wikimedia have the TimedMediaHandler extension installed which uses ffmpeg. + # But we don't, so is this needed? + 'ffmpeg', + 'libvips15', + 'ttf-arphic-ukai', + 'ttf-arphic-uming', + 'ttf-farsiweb', + 'ttf-khmeros', + 'ttf-lao', + 'ttf-manchufont', + 'ttf-mgopen', + 'ttf-nafees', + 'ttf-sil-abyssinica', + 'ttf-sil-ezra', + 'ttf-sil-padauk', + 'ttf-takao-gothic', + 'ttf-takao-mincho', + 'ttf-thai-tlwg', + 'ttf-tmuni']: + ensure => present, + } + } elsif $::lsbdistcodename == 'trusty' { + # No ffmpeg - it should work without? + # If it's needed it could be a pain as Ubuntu doesn't package it for trusty + package { [ 'libvips37', + 'fonts-arphic-ukai', + 'fonts-arphic-uming', + 'fonts-farsiweb', + 'fonts-khmeros', + 'fonts-lao', + 'fonts-manchufont', + 'fonts-mgopen', + 'fonts-nafees', + 'fonts-sil-abyssinica', + 'fonts-sil-ezra', + 'fonts-sil-padauk', + 'fonts-takao-gothic', + 'fonts-takao-mincho', + 'fonts-thai-tlwg', + 'fonts-tibetan-machine']: + ensure => present, + } + } package { [ 'djvulibre-bin', - 'ffmpeg', 'ffmpeg2theora', 'ghostscript', 'gsfonts', @@ -10,7 +55,6 @@ class mediawiki::image_scaler { 'libogg0', 'librsvg2-bin', 'libtheora0', - 'libvips15', 'libvips-tools', 'libvorbisenc2', 'netpbm', @@ -18,34 +62,19 @@ class mediawiki::image_scaler { 'texlive-fonts-recommended', 'ttf-alee', 'ttf-arabeyes', - 'ttf-arphic-ukai', - 'ttf-arphic-uming', 'ttf-bengali-fonts', 'ttf-devanagari-fonts', - 'ttf-farsiweb', 'ttf-gujarati-fonts', 'ttf-kacst', 'ttf-kannada-fonts', - 'ttf-khmeros', - 'ttf-lao', 'ttf-liberation', 'ttf-linux-libertine', 'ttf-malayalam-fonts', - 'ttf-manchufont', - 'ttf-mgopen', - 'ttf-nafees', 'ttf-oriya-fonts', 'ttf-punjabi-fonts', - 'ttf-sil-abyssinica', - 'ttf-sil-ezra', - 'ttf-sil-padauk', 'ttf-sil-scheherazade', 'ttf-sil-yi', - 'ttf-takao-gothic', - 'ttf-takao-mincho', 'ttf-tamil-fonts', - 'ttf-thai-tlwg', - 'ttf-tmuni', 'ttf-ubuntu-font-family', 'ttf-unfonts-extra', 'ttf-wqy-zenhei',