Ori.livneh has submitted this change and it was merged.
Change subject: Revert "Remove /etc/wikimedia-image-scaler"
......................................................................
Revert "Remove /etc/wikimedia-image-scaler"
This reverts commit 8a9257f41dd9. $wgDisableOutputCompression
Setting $wgDisableOutputCompression to 'true' across the fleet (in If792de0112)
was not a no-op, contrary to my expectation. So there is still a need to
differentiate the scalers from other app servers at the PHP configuration level
for now.
Change-Id: I7f9f7f3d8885fe0ca90b4628ed2257f3c5b965be
---
M manifests/role/mediawiki.pp
1 file changed, 16 insertions(+), 6 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 1e3dd95..36c2aae 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -134,28 +134,38 @@
}
}
+class role::mediawiki::scaler {
+ include ::role::mediawiki::common
+ include ::mediawiki::multimedia
+
+ file { '/etc/wikimedia-scaler':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ }
+}
+
class role::mediawiki::imagescaler {
system::role { 'role::mediawiki::imagescaler': }
- include ::mediawiki::multimedia
+ include ::role::mediawiki::scaler
include ::role::mediawiki::webserver
- include base::firewall
+ include ::base::firewall
}
class role::mediawiki::videoscaler {
system::role { 'role::mediawiki::videoscaler': }
- include ::role::mediawiki::common
- include ::mediawiki::multimedia
+ include ::role::mediawiki::scaler
include ::mediawiki::jobrunner
- include base::firewall
+ include ::base::firewall
}
class role::mediawiki::jobrunner {
system::role { 'role::mediawiki::jobrunner': }
include ::role::mediawiki::common
-
include ::mediawiki::jobrunner
}
--
To view, visit https://gerrit.wikimedia.org/r/251188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f9f7f3d8885fe0ca90b4628ed2257f3c5b965be
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
