Yuvipanda has submitted this change and it was merged.
Change subject: extdist: Support distributing skins
......................................................................
extdist: Support distributing skins
Change-Id: I1d661c5312c4053ca36d4cb427f9bc497aa2ec3a
---
M modules/extdist/manifests/init.pp
1 file changed, 31 insertions(+), 3 deletions(-)
Approvals:
Chad: Looks good to me, but someone else must approve
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/extdist/manifests/init.pp
b/modules/extdist/manifests/init.pp
index 9ba9856..b7e2692 100644
--- a/modules/extdist/manifests/init.pp
+++ b/modules/extdist/manifests/init.pp
@@ -12,13 +12,22 @@
$src_path = "${base_dir}/src"
$pid_folder = '/run/extdist'
- $settings = {
+ $ext_settings = {
'API_URL' => 'https://www.mediawiki.org/w/api.php',
- 'DIST_PATH' => $dist_dir,
'GIT_URL' =>
'https://gerrit.wikimedia.org/r/mediawiki/extensions/%s',
+ 'DIST_PATH' => "${dist_dir}/extensions",
'LOG_FILE' => $log_path,
'SRC_PATH' => $src_path,
'PID_FILE' => "${pid_folder}/pid.lock"
+ }
+
+ $skin_settings = {
+ 'API_URL' => 'https://www.mediawiki.org/w/api.php',
+ 'DIST_PATH' => "${dist_dir}/skins",
+ 'GIT_URL' => 'https://gerrit.wikimedia.org/r/mediawiki/skins/%s',
+ 'LOG_FILE' => $log_path,
+ 'SRC_PATH' => $src_path,
+ 'PID_FILE' => "${pid_folder}/skinpid.lock"
}
user { 'extdist':
@@ -57,7 +66,14 @@
file { '/etc/extdist.conf':
ensure => present,
- content => ordered_json($settings),
+ content => ordered_json($ext_settings),
+ owner => 'extdist',
+ require => User['extdist']
+ }
+
+ file { '/etc/skindist.conf':
+ ensure => present,
+ content => ordered_json($skin_settings),
owner => 'extdist',
require => User['extdist']
}
@@ -74,6 +90,18 @@
]
}
+ cron { 'skindist-generate-tarballs':
+ command => "/usr/bin/python $clone_dir/nightly.py --all --skins",
+ user => 'extdist',
+ minute => '30',
+ hour => '*',
+ require => [
+ Git::Clone['labs/tools/extdist'],
+ User['extdist'],
+ File['/etc/skindist.conf']
+ ]
+ }
+
nginx::site { 'extdist':
content => template('extdist/extdist.nginx.erb'),
}
--
To view, visit https://gerrit.wikimedia.org/r/174471
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d661c5312c4053ca36d4cb427f9bc497aa2ec3a
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: 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
