Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174471
Change subject: extdist: Support distributing skins
......................................................................
extdist: Support distributing skins
Change-Id: I1d661c5312c4053ca36d4cb427f9bc497aa2ec3a
---
M modules/extdist/manifests/init.pp
1 file changed, 29 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/174471/1
diff --git a/modules/extdist/manifests/init.pp
b/modules/extdist/manifests/init.pp
index 5f4d533..74b8e5e 100644
--- a/modules/extdist/manifests/init.pp
+++ b/modules/extdist/manifests/init.pp
@@ -14,11 +14,20 @@
$settings = {
'API_URL' => "https://www.mediawiki.org/w/api.php";,
- 'DIST_PATH' => $dist_dir,
+ 'DIST_PATH' => "$dist_dir/extensions",
'GIT_URL' =>
"https://gerrit.wikimedia.org/r/mediawiki/extensions/%s";,
'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':
@@ -62,6 +71,13 @@
require => User['extdist']
}
+ file { '/etc/skindist.conf':
+ ensure => present,
+ content => ordered_json($skin_settings),
+ owner => 'extdist',
+ require => User['extdist']
+ }
+
cron { 'extdist-generate-tarballs':
command => "/usr/bin/python $clone_dir/nightly.py --all",
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: newchange
Gerrit-Change-Id: I1d661c5312c4053ca36d4cb427f9bc497aa2ec3a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
