Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/65254
Change subject: beta: symlink /a/common
......................................................................
beta: symlink /a/common
The multiversion/defines.php does use /a/common which is not existing on
the beta cluster. This patch makes it a symbolic link to the shared
directory.
That also makes puppet ensure /a/common exists in production.
Change-Id: Iaf19f0e8cf029cdbbbb2dabe3ae1d07cee417c39
---
M manifests/misc/deployment.pp
1 file changed, 16 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/65254/1
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 0dff2ed..e3846a7 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -360,15 +360,25 @@
$dblist_common_source = $dblist_common
} elsif $system == "scap" {
$mw_common = "/usr/local/apache/common-local"
- if $::realm == 'production' {
- $mw_common_source = "/a/common"
- } else {
- # For the beta cluster
- $mw_common_source = "/data/project/apache/common-local"
- }
+ $mw_common_source = "/a/common"
$dblist_common = $mw_common
$dblist_common_source = $mw_common_source
}
+
+ if $::realm == 'production' {
+ file { $mw_common_source:
+ ensure => directory,
+ owner => root,
+ group => wikidev,
+ mode => '0775',
+ }
+ } else {
+ file { $mw_common_source:
+ ensure => link,
+ target => '/data/project/apache/common-local',
+ }
+ }
+
file {
"/usr/local/lib/mw-deployment-vars.sh":
owner => root,
--
To view, visit https://gerrit.wikimedia.org/r/65254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf19f0e8cf029cdbbbb2dabe3ae1d07cee417c39
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