Giuseppe Lavagetto has submitted this change and it was merged. Change subject: mediawiki::multimedia: on trusty, install libvips37 rather than libvips15 ......................................................................
mediawiki::multimedia: on trusty, install libvips37 rather than libvips15 Change-Id: I503035f07c9a79bb7ba1119d6ed4d55a7abf3834 --- M modules/mediawiki/manifests/multimedia.pp 1 file changed, 7 insertions(+), 4 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/mediawiki/manifests/multimedia.pp b/modules/mediawiki/manifests/multimedia.pp index adb588a..3f869a8 100644 --- a/modules/mediawiki/manifests/multimedia.pp +++ b/modules/mediawiki/manifests/multimedia.pp @@ -13,20 +13,23 @@ minute => '*/5', } - $libav_package = $::lsbdistcodename ? { - precise => 'ffmpeg', - trusty => 'libav-tools', + if $::lsbdistcodename == 'trusty' { + $libav_package = 'libav-tools' + $libvips_package = 'libvips37' + } elsif $::lsbdistcodename == 'precise' { + $libav_package = 'ffmpeg' + $libvips_package = 'libvips15' } package { [ $libav_package, + $libvips_package, 'ffmpeg2theora', 'ghostscript', 'libjpeg-turbo-progs', 'libogg0', 'libtheora0', 'libvips-tools', - 'libvips15', 'libvorbisenc2', 'netpbm', 'oggvideotools', -- To view, visit https://gerrit.wikimedia.org/r/147992 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I503035f07c9a79bb7ba1119d6ed4d55a7abf3834 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh <o...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits