BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/301403
Change subject: firejail: imagemagick rules must depend on package
......................................................................
firejail: imagemagick rules must depend on package
Fix an ordering issue on initial provision where the filejail rules for
imagemagick may be scheduled for provisioning before firejail package
makes the target directory available.
Change-Id: I318381251d50b09abeadf7cdac9f3ab972d32881
---
M modules/mediawiki/manifests/init.pp
1 file changed, 9 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/301403/1
diff --git a/modules/mediawiki/manifests/init.pp
b/modules/mediawiki/manifests/init.pp
index 1da537b..b915399 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -33,15 +33,16 @@
include ::mediawiki::hhvm
- # This profile is used to contain the convert command of imagemagick using
firejail
- # Profiles specific to the image/video scalers are handled via
mediawiki::firejail,
- # but imagemagick is also used on the general purpose appscalers for
scaling musical
- # typesheets in the Score extension
+ # This profile is used to contain the convert command of imagemagick using
+ # firejail Profiles specific to the image/video scalers are handled via
+ # mediawiki::firejail, but imagemagick is also used on the general purpose
+ # appscalers for scaling musical typesheets in the Score extension
file { '/etc/firejail/mediawiki-imagemagick.profile':
- source => 'puppet:///modules/mediawiki/mediawiki-imagemagick.profile',
- owner => 'root',
- group => 'root',
- mode => '0644',
+ source => 'puppet:///modules/mediawiki/mediawiki-imagemagick.profile',
+ owner => 'root',
+ group => 'root',
+ mode => '0644',
+ require => Package['firejail'],
}
file { '/usr/local/bin/mediawiki-firejail-convert':
--
To view, visit https://gerrit.wikimedia.org/r/301403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I318381251d50b09abeadf7cdac9f3ab972d32881
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
