Ori.livneh has submitted this change and it was merged.

Change subject: Remove duplicate packages from imagescaler manifest
......................................................................


Remove duplicate packages from imagescaler manifest

* Remove gsfonts, imagemagick, librsvg2-bin, djvulibre-bin from imagescaler
  manifest, as these packages are part of applicationserver::packages.
* Eradicate leftover references to applicationserver::cron

Change-Id: I05167ff6465496b4c425cb9ae1e6c618ba7b8476
---
M manifests/imagescaler.pp
M manifests/role/applicationserver.pp
2 files changed, 0 insertions(+), 7 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/manifests/imagescaler.pp b/manifests/imagescaler.pp
index 85767d3..e3813b8 100644
--- a/manifests/imagescaler.pp
+++ b/manifests/imagescaler.pp
@@ -21,12 +21,9 @@
 
     package {
         [
-            'imagemagick',
             'ghostscript',
             'ffmpeg',
             'ffmpeg2theora',
-            'librsvg2-bin',
-            'djvulibre-bin',
             'netpbm',
             'libogg0',
             'libvorbisenc2',
@@ -72,7 +69,6 @@
             'fonts-unfonts-extra',
             'fonts-vlgothic', # bug 64002
 
-            'gsfonts',
             'texlive-fonts-recommended',
 
             'ttf-alee',
diff --git a/manifests/role/applicationserver.pp 
b/manifests/role/applicationserver.pp
index 71661fd..e251809 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -239,7 +239,6 @@
 
         include applicationserver::config::base,
             applicationserver::packages,
-            applicationserver::cron,
             applicationserver::sudo,
             role::applicationserver::configuration::php
 
@@ -275,7 +274,6 @@
 
         include applicationserver::config::base,
             applicationserver::packages,
-            applicationserver::cron,
             applicationserver::sudo,
             role::applicationserver::configuration::php
 
@@ -295,7 +293,6 @@
 
         include applicationserver::config::base,
             applicationserver::packages,
-            applicationserver::cron,
             applicationserver::sudo,
             role::applicationserver::configuration::php
     }

-- 
To view, visit https://gerrit.wikimedia.org/r/133932
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I05167ff6465496b4c425cb9ae1e6c618ba7b8476
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to