Jgreen has submitted this change and it was merged.

Change subject: New packages and apparmor entries
......................................................................


New packages and apparmor entries

We're doing more cleanup on images now which require these packages
and applications. Still need to test that I've got all the new
binaries for apparmor but that'll come later.

Change-Id: Icdc70b97af373291ade01d37f081453adcf415d5
---
M modules/ocg/manifests/init.pp
M modules/ocg/templates/usr.bin.nodejs.apparmor.erb
2 files changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Jgreen: Checked; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ocg/manifests/init.pp b/modules/ocg/manifests/init.pp
index 84f2ab9..f9603ba 100644
--- a/modules/ocg/manifests/init.pp
+++ b/modules/ocg/manifests/init.pp
@@ -86,6 +86,7 @@
             'latex-xcolor',
             'lmodern',
             'imagemagick',
+            'poppler-utils',
             'libjpeg-progs',
             'librsvg2-bin',
             'unzip',
diff --git a/modules/ocg/templates/usr.bin.nodejs.apparmor.erb 
b/modules/ocg/templates/usr.bin.nodejs.apparmor.erb
index ac42f20..9ed1c93 100755
--- a/modules/ocg/templates/usr.bin.nodejs.apparmor.erb
+++ b/modules/ocg/templates/usr.bin.nodejs.apparmor.erb
@@ -27,6 +27,8 @@
 
   /usr/bin/rsvg-convert cx -> imagetools,
   /usr/bin/*.im6 cx -> imagetools,
+  /usr/bin/pdfseparate cx -> imagetools,
+  /usr/bin/jpegtran cx -> imagetools,
   profile imagetools {
     #include <abstractions/base>
     network stream, # Used for ImageMagick tools

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icdc70b97af373291ade01d37f081453adcf415d5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mwalker <mwal...@wikimedia.org>
Gerrit-Reviewer: Jgreen <jgr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to