Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64057
Change subject: beta: appserver should uses /data/project/apache
......................................................................
beta: appserver should uses /data/project/apache
On beta, this make sure any application server (web or jobrunner) has a
/usr/local/apache pointing to /data/project/apache.
Change-Id: I89a92a8d5af7c6923e34abad75cde4e24e3a7090
---
M modules/applicationserver/manifests/config/apache.pp
M modules/applicationserver/manifests/config/base.pp
2 files changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/64057/1
diff --git a/modules/applicationserver/manifests/config/apache.pp
b/modules/applicationserver/manifests/config/apache.pp
index c4c3c36..ce617e5 100644
--- a/modules/applicationserver/manifests/config/apache.pp
+++ b/modules/applicationserver/manifests/config/apache.pp
@@ -39,10 +39,6 @@
notify => Service[apache]
}
} else { # labs
- file { '/usr/local/apache':
- ensure => link,
- target => '/data/project/apache',
- }
# bug 38996 - Apache service does not run on start, need a fake
# sync to start it up.
exec { 'Fake sync apache wmf config on beta':
diff --git a/modules/applicationserver/manifests/config/base.pp
b/modules/applicationserver/manifests/config/base.pp
index 4ca321f..5809b0e 100644
--- a/modules/applicationserver/manifests/config/base.pp
+++ b/modules/applicationserver/manifests/config/base.pp
@@ -3,4 +3,10 @@
class applicationserver::config::base {
# Other classes can depend on this to ensure all configuration
# is complete
-}
\ No newline at end of file
+ if $::realm == 'labs' {
+ file { '/usr/local/apache':
+ ensure => link,
+ target => '/data/project/apache',
+ }
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/64057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I89a92a8d5af7c6923e34abad75cde4e24e3a7090
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
