Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/313964
Change subject: Move mediawiki-converters.profile
mediawiki-firejail-ghostscript to all mediawiki servers
......................................................................
Move mediawiki-converters.profile mediawiki-firejail-ghostscript to all
mediawiki servers
mediawiki-firejail-ghostscript is needed on all app servers and
mediawiki-converters.profile is also needed in general. This also
allows to migrate mediawiki-firejail-convert to mediawiki-converters.profile.
Change-Id: I7400051f888ecfddc3355a9c96dd8e91f0e40c05
---
M modules/mediawiki/manifests/firejail.pp
M modules/mediawiki/manifests/init.pp
2 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/313964/1
diff --git a/modules/mediawiki/manifests/firejail.pp
b/modules/mediawiki/manifests/firejail.pp
index 9c8fa8c..449ff93 100644
--- a/modules/mediawiki/manifests/firejail.pp
+++ b/modules/mediawiki/manifests/firejail.pp
@@ -7,20 +7,6 @@
class mediawiki::firejail {
- file { '/etc/firejail/mediawiki-converters.profile':
- source => 'puppet:///modules/mediawiki/mediawiki-converters.profile',
- owner => 'root',
- group => 'root',
- mode => '0644',
- }
-
- file { '/usr/local/bin/mediawiki-firejail-ghostscript':
- source => 'puppet:///modules/mediawiki/mediawiki-firejail-ghostscript',
- owner => 'root',
- group => 'root',
- mode => '0555',
- }
-
file { '/usr/local/bin/mediawiki-firejail-ffmpeg':
source => 'puppet:///modules/mediawiki/mediawiki-firejail-ffmpeg',
owner => 'root',
diff --git a/modules/mediawiki/manifests/init.pp
b/modules/mediawiki/manifests/init.pp
index b915399..6014b46 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -52,6 +52,20 @@
mode => '0555',
}
+ file { '/etc/firejail/mediawiki-converters.profile':
+ source => 'puppet:///modules/mediawiki/mediawiki-converters.profile',
+ owner => 'root',
+ group => 'root',
+ mode => '0644',
+ }
+
+ file { '/usr/local/bin/mediawiki-firejail-ghostscript':
+ source => 'puppet:///modules/mediawiki/mediawiki-firejail-ghostscript',
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ }
+
# We've set the 'php' grain in the past, but we don't really need it
anymore
salt::grain { 'php':
ensure => absent,
--
To view, visit https://gerrit.wikimedia.org/r/313964
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7400051f888ecfddc3355a9c96dd8e91f0e40c05
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
