Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/160094
Change subject: mediawiki::scap: update for I083d6e58e
......................................................................
mediawiki::scap: update for I083d6e58e
* Don't create symlinks; scap will invoke sync-common and scap-rebuild-cdbs
using qualified paths.
Change-Id: I1be208d1b7a537977fc31ed695cec7d2d7f4fbcb
---
M modules/mediawiki/manifests/scap.pp
1 file changed, 9 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/160094/1
diff --git a/modules/mediawiki/manifests/scap.pp
b/modules/mediawiki/manifests/scap.pp
index 3274bfb..944dc91 100644
--- a/modules/mediawiki/manifests/scap.pp
+++ b/modules/mediawiki/manifests/scap.pp
@@ -3,6 +3,7 @@
$mediawiki_deployment_dir = '/srv/mediawiki'
$mediawiki_staging_dir = '/srv/mediawiki-staging'
+ $scap_bin_dir = '/srv/deployment/scap/scap/bin'
package { 'scap':
ensure => latest,
@@ -10,10 +11,10 @@
}
file { $mediawiki_deployment_dir:
- ensure => directory,
- owner => 'mwdeploy',
- group => 'mwdeploy',
- mode => '0775',
+ ensure => directory,
+ owner => 'mwdeploy',
+ group => 'mwdeploy',
+ mode => '0775',
}
file { '/etc/profile.d/mediawiki.sh':
@@ -23,22 +24,10 @@
mode => '0444',
}
- # These get invoked by scap over SSH using a non-interactive, non-login
- # shell and thus won't pick up the /etc/profile.d script declared above.
- file { '/usr/local/bin/scap-rebuild-cdbs':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/scap-rebuild-cdbs',
- require => Package['scap'],
- }
-
- file { '/usr/local/bin/sync-common':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/sync-common',
- require => Package['scap'],
- }
-
- exec { '/usr/local/bin/sync-common':
- creates =>
"${mediawiki_deployment_dir}/wmf-config/InitialiseSettings.php",
+ exec { 'fetch_mediawiki':
+ command => "${scap_bin_dir}/sync-common",
+ creates => "${mediawiki_deployment_dir}/docroot",
+ require => [ File[$mediawiki_deployment_dir], Package['scap'] ],
timeout => 30 * 60, # 30 minutes
}
}
--
To view, visit https://gerrit.wikimedia.org/r/160094
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1be208d1b7a537977fc31ed695cec7d2d7f4fbcb
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
