Giuseppe Lavagetto has submitted this change and it was merged.
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, 8 insertions(+), 4 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/manifests/sync.pp
b/modules/mediawiki/manifests/sync.pp
index 38ba2b2..d79c94d 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -29,6 +29,14 @@
target => '/srv/deployment/scap/scap/bin/refreshCdbJsonFiles',
}
+ file { '/usr/local/apache':
+ ensure => directory,
+ owner => root,
+ group => root,
+ mode => '0755',
+ replace => false,
+ }
+
file { '/usr/local/apache/common':
ensure => link,
target => '/usr/local/apache/common-local',
diff --git a/modules/mediawiki/manifests/web.pp
b/modules/mediawiki/manifests/web.pp
index 7c57532..af11754 100644
--- a/modules/mediawiki/manifests/web.pp
+++ b/modules/mediawiki/manifests/web.pp
@@ -5,8 +5,4 @@
include ::mediawiki::monitoring::webserver
include ::mediawiki::web::config
include ::apache
-
- 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: merged
Gerrit-Change-Id: I05bb392c4e7efb14e191bee55d869184eab60459
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
