Giuseppe Lavagetto has submitted this change and it was merged. Change subject: scap: correct clone directives ......................................................................
scap: correct clone directives Also correct the erroneous documentation of git::clone Change-Id: Ie6705ea3b4f0c36675bbb67acb916c54b7ce7623 --- M modules/git/manifests/clone.pp M modules/scap/manifests/l10nupdate.pp 2 files changed, 20 insertions(+), 3 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/modules/git/manifests/clone.pp b/modules/git/manifests/clone.pp index cce0eff..d41be3b 100644 --- a/modules/git/manifests/clone.pp +++ b/modules/git/manifests/clone.pp @@ -39,7 +39,7 @@ # } # # Will clone +http://blabla.org/core.git+ branch +the_best_branch+ at -# +/path/to/clone/container/core+ +# +/path/to/clone/container/+ # # # Example: check out from gerrit: # git::clone { 'analytics/wikimetrics': diff --git a/modules/scap/manifests/l10nupdate.pp b/modules/scap/manifests/l10nupdate.pp index a9c7a27..b5684ad 100644 --- a/modules/scap/manifests/l10nupdate.pp +++ b/modules/scap/manifests/l10nupdate.pp @@ -114,11 +114,28 @@ group => $deployment_group, mode => '0755', } - git::clone { ['mediawiki/core', 'mediawiki/skins', 'mediawiki/extensions']: - directory => '/var/lib/l10nupdate/mediawiki/', + + git::clone { 'mediawiki/core': + directory => '/var/lib/l10nupdate/mediawiki/core', owner => 'l10nupdate', group => $deployment_group, recurse_submodules => true, + require => File['/var/lib/l10nupdate/mediawiki'], + } + + git::clone { 'mediawiki/extensions': + directory => '/var/lib/l10nupdate/mediawiki/extensions', + owner => 'l10nupdate', + group => $deployment_group, + require => File['/var/lib/l10nupdate/mediawiki'], + } + + git::clone { 'mediawiki/skins': + directory => '/var/lib/l10nupdate/mediawiki/skins', + owner => 'l10nupdate', + group => $deployment_group, + recurse_submodules => true, + require => File['/var/lib/l10nupdate/mediawiki'], } } -- To view, visit https://gerrit.wikimedia.org/r/268681 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie6705ea3b4f0c36675bbb67acb916c54b7ce7623 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
