Tim Starling has submitted this change and it was merged.
Change subject: Don't put scap scripts in the root directory
......................................................................
Don't put scap scripts in the root directory
I don't know why $misc::deployment::scap_scripts::scriptpath is empty,
but I'm happy to leave it for someone else to figure out since I'm on a
fairly tight schedule.
Change-Id: I6e632b51dffe5ccb9d953a92ddb6052a9a23a6f6
---
M modules/mediawiki/manifests/sync.pp
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Tim Starling: Verified; Looks good to me, approved
diff --git a/modules/mediawiki/manifests/sync.pp
b/modules/mediawiki/manifests/sync.pp
index 4745ac8..54572cf 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -4,7 +4,7 @@
require mediawiki::packages
require mediawiki::users::l10nupdate
- $scriptpath = $misc::deployment::scap_scripts::scriptpath
+ $scriptpath = "/usr/local/bin"
file {
"${scriptpath}/scap-1":
@@ -22,6 +22,11 @@
group => root,
mode => '0555',
source => 'puppet:///files/scap/sync-common';
+
+ # Fix $scriptpath screwup
+ "/scap-1": ensure => absent;
+ "/scap-2": ensure => absent;
+ "/sync-common": ensure => absent;
}
exec { 'mw-sync':
--
To view, visit https://gerrit.wikimedia.org/r/63630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e632b51dffe5ccb9d953a92ddb6052a9a23a6f6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Starling <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
