Ori.livneh has submitted this change and it was merged.
Change subject: Move Git::clone['mediawiki/tools/scap'] to mediawiki::sync
......................................................................
Move Git::clone['mediawiki/tools/scap'] to mediawiki::sync
Follows I9b22cb307, where I declared it in misc::deployment. That won't do,
since it is only applied on tin.
Change-Id: Ie2c0949a649cdc8a91764c4e1de8e4ce21fa72fa
---
M manifests/misc/deployment.pp
M modules/mediawiki/manifests/sync.pp
2 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 317bd9d..7ee25ad 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -170,15 +170,6 @@
$scriptpath = "/usr/local/bin"
- # This repository is the staging area for the scap rewrite.
- git::clone { 'mediawiki/tools/scap':
- directory => '/srv/scap',
- owner => 'root',
- group => 'mwdeploy',
- mode => '0775',
- origin =>
'https://gerrit.wikimedia.org/r/p/mediawiki/tools/scap.git',
- }
-
file {
"${scriptpath}/mw-update-l10n":
owner => root,
diff --git a/modules/mediawiki/manifests/sync.pp
b/modules/mediawiki/manifests/sync.pp
index 05352da..35a8bb8 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -6,6 +6,15 @@
require mediawiki::packages
require mediawiki::users::l10nupdate
+ # This repository is the staging area for the scap rewrite.
+ git::clone { 'mediawiki/tools/scap':
+ directory => '/srv/scap',
+ owner => 'root',
+ group => 'mwdeploy',
+ mode => '0775',
+ origin =>
'https://gerrit.wikimedia.org/r/p/mediawiki/tools/scap.git',
+ }
+
$scriptpath = "/usr/local/bin"
file {
--
To view, visit https://gerrit.wikimedia.org/r/111385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2c0949a649cdc8a91764c4e1de8e4ce21fa72fa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
