Yuvipanda has submitted this change and it was merged.
Change subject: extdist: clone composer into /srv/composer
......................................................................
extdist: clone composer into /srv/composer
Bug: T70940
Change-Id: I9c4c655eec649019bd40bcd397e9e8a435e448d2
---
M modules/extdist/manifests/init.pp
1 file changed, 12 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/extdist/manifests/init.pp
b/modules/extdist/manifests/init.pp
index b7e2692..05b5f9a 100644
--- a/modules/extdist/manifests/init.pp
+++ b/modules/extdist/manifests/init.pp
@@ -10,6 +10,7 @@
$dist_dir = "${base_dir}/dist"
$clone_dir = "${base_dir}/extdist"
$src_path = "${base_dir}/src"
+ $composer_dir = "${base_dir}/composer"
$pid_folder = '/run/extdist'
$ext_settings = {
@@ -48,7 +49,7 @@
require => User['extdist']
}
- file { [$dist_dir, $clone_dir, $src_path, $pid_folder]:
+ file { [$dist_dir, $clone_dir, $src_path, $pid_folder, $composer_dir]:
ensure => directory,
owner => 'extdist',
group => 'www-data',
@@ -64,6 +65,16 @@
group => 'extdist',
}
+ git::clone { 'integration/composer':
+ ensure => 'latest',
+ directory => $composer_dir,
+ branch => 'master',
+ require => [File[$composer_dir], User['extdist']],
+ recurse_submodules => true,
+ owner => 'extdist',
+ group => 'extdist',
+ }
+
file { '/etc/extdist.conf':
ensure => present,
content => ordered_json($ext_settings),
--
To view, visit https://gerrit.wikimedia.org/r/176294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c4c655eec649019bd40bcd397e9e8a435e448d2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
