Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/146142
Change subject: mediawiki: move File['/usr/local/apache'] from web.pp -> sync.pp
......................................................................
mediawiki: move File['/usr/local/apache'] from web.pp -> sync.pp
sync.pp is included on all app servers, and it depends on /usr/local/apache, so
we can't only define it on web nodes.
Change-Id: I05bb392c4e7efb14e191bee55d869184eab60459
---
M modules/mediawiki/manifests/sync.pp
M modules/mediawiki/manifests/web.pp
2 files changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/42/146142/1
diff --git a/modules/mediawiki/manifests/sync.pp
b/modules/mediawiki/manifests/sync.pp
index 38ba2b2..930b992 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -34,7 +34,7 @@
target => '/usr/local/apache/common-local',
}
- file { '/a':
+ file { [ '/a', '/usr/local/apache' ]:
ensure => directory,
owner => 'root',
group => 'root',
diff --git a/modules/mediawiki/manifests/web.pp
b/modules/mediawiki/manifests/web.pp
index 929032a..7ca4942 100644
--- a/modules/mediawiki/manifests/web.pp
+++ b/modules/mediawiki/manifests/web.pp
@@ -4,8 +4,4 @@
include ::mediawiki
include ::mediawiki::monitoring::webserver
include ::mediawiki::web::config
-
- file { '/usr/local/apache':
- ensure => directory,
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/146142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I05bb392c4e7efb14e191bee55d869184eab60459
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
