Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134560
Change subject: prevent apache2 service log churn on non-web mediawiki servers
......................................................................
prevent apache2 service log churn on non-web mediawiki servers
This fixes a bug I introduced in the patch series that culminated in
Ie0807c706, the result of which is the apache2 service getting picked up by the
non-web application servers.
There is substantial clean-up work remaining: the whole mediawiki::config::*
hierarchy ought to be dissolved, with mediawiki::config::apache merged into
mediawiki::service (and mediawiki::service renamed to mediawiki::web). But I'd
like to do this as a first step, and then do further clean-up in subsequent
patches.
To validate this patch after it is merged:
* Run Puppet on mw1114 (api), mw1021 (app), mw1149 (bits) and confirm that the
patch is a no-op on these host classes.
* Run Puppet on mw1157 (image scaler), mw1002 (job runner), and tmh1001 (video
scaler) and confirm that the apache service is stopped and not restarted.
Change-Id: I0b2580a757fc1c54987a290d1d3aaf006f7f794e
---
M manifests/role/mediawiki.pp
M modules/mediawiki/manifests/config/apache.pp
M modules/mediawiki/manifests/init.pp
M modules/mediawiki/manifests/service.pp
4 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/134560/1
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index aeb9be3..f8a7dd5 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -92,6 +92,7 @@
class webserver($maxclients="40") {
include ::mediawiki,
::mediawiki::pybal_check,
+ ::mediawiki::service,
role::mediawiki,
role::mediawiki::configuration::php
diff --git a/modules/mediawiki/manifests/config/apache.pp
b/modules/mediawiki/manifests/config/apache.pp
index d6f99d7..733b5d9 100644
--- a/modules/mediawiki/manifests/config/apache.pp
+++ b/modules/mediawiki/manifests/config/apache.pp
@@ -7,8 +7,6 @@
) {
require mediawiki::packages
- Class['mediawiki::config::apache'] -> Class['mediawiki::config::base']
-
file { '/etc/apache2/apache2.conf':
owner => root,
group => root,
diff --git a/modules/mediawiki/manifests/init.pp
b/modules/mediawiki/manifests/init.pp
index 9aff034..a5490b6 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -4,7 +4,6 @@
include ::mediawiki::cgroup
include ::mediawiki::packages
include ::mediawiki::config::base
- include ::mediawiki::service
class { '::twemproxy':
default_file => 'puppet:///modules/mediawiki/twemproxy.default',
diff --git a/modules/mediawiki/manifests/service.pp
b/modules/mediawiki/manifests/service.pp
index bacc76f..64ea714 100644
--- a/modules/mediawiki/manifests/service.pp
+++ b/modules/mediawiki/manifests/service.pp
@@ -2,6 +2,7 @@
class mediawiki::service {
require mediawiki::config::base
+ require mediawiki::config::apache
require mediawiki::packages
include mediawiki::sync
--
To view, visit https://gerrit.wikimedia.org/r/134560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b2580a757fc1c54987a290d1d3aaf006f7f794e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
