Ottomata has submitted this change and it was merged.
Change subject: Checkout geowiki's data-private repo also on statistics'
webservers
......................................................................
Checkout geowiki's data-private repo also on statistics' webservers
Change-Id: Ic3df699d15b2af1b2a22ecd5ca908085717bd282
---
M manifests/misc/statistics.pp
M manifests/role/statistics.pp
2 files changed, 23 insertions(+), 12 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index e7cb365..6db7954 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -895,6 +895,25 @@
}
}
+# == Class misc::statistics::geowiki::data::private
+# Makes sure the geowiki's data-private repository is available.
+#
+class misc::statistics::geowiki::data::private {
+ require misc::statistics::geowiki,
+ misc::statistics::geowiki::data::private_bare::sync
+
+ $geowiki_user = $misc::statistics::geowiki::geowiki_user
+ $geowiki_private_data_path = "${geowiki_base_path}/data-private"
+ $geowiki_private_data_bare_path =
$misc::statistics::geowiki::data::private_bare::sync::geowiki_private_data_bare_path
+
+ git::clone { 'geowiki-data-private':
+ directory => $geowiki_private_data_path,
+ origin => "file://${geowiki_private_data_bare_path}",
+ ensure => 'latest',
+ owner => $geowiki_user,
+ }
+}
+
# == Class misc::statistics::geowiki::jobs::data
# Installs a cron job to get recent editor data
# from the research slave databases and generate
@@ -954,27 +973,19 @@
class misc::statistics::geowiki::jobs::limn {
require misc::statistics::geowiki,
misc::statistics::geowiki::mysql::conf::research,
- misc::statistics::geowiki::data::private_bare::sync,
+ misc::statistics::geowiki::data::private,
misc::statistics::packages::python
$geowiki_user = $misc::statistics::geowiki::geowiki_user
$geowiki_base_path = $misc::statistics::geowiki::geowiki_base_path
$geowiki_scripts_path = $misc::statistics::geowiki::geowiki_scripts_path
$geowiki_public_data_path = "${geowiki_base_path}/data-public"
- $geowiki_private_data_path = "${geowiki_base_path}/data-private"
- $geowiki_private_data_bare_path =
$misc::statistics::geowiki::data::private_bare::sync::geowiki_private_data_bare_path
+ $geowiki_private_data_path =
$misc::statistics::geowiki::data::private::geowiki_private_data_path
$geowiki_mysql_research_conf_file =
$misc::statistics::geowiki::mysql::conf::research::conf_file
git::clone { 'geowiki-data-public':
directory => $geowiki_public_data_path,
origin =>
"ssh://gerrit.wikimedia.org:29418/analytics/geowiki/data-public.git",
- ensure => 'latest',
- owner => $geowiki_user,
- }
-
- git::clone { 'geowiki-data-private':
- directory => $geowiki_private_data_path,
- origin => "file://${geowiki_private_data_bare_path}",
ensure => 'latest',
owner => $geowiki_user,
}
diff --git a/manifests/role/statistics.pp b/manifests/role/statistics.pp
index a15111f..b34cec8 100644
--- a/manifests/role/statistics.pp
+++ b/manifests/role/statistics.pp
@@ -46,8 +46,8 @@
misc::statistics::sites::reportcard,
# rsync public datasets from stat1 hourly
misc::statistics::public_datasets,
- # rsync geowiki's bare data-private from stat1 daily
- misc::statistics::geowiki::data::private_bare::sync
+ # rsync geowiki's data-private from stat1 daily
+ misc::statistics::geowiki::data::private
}
class role::statistics::private inherits role::statistics {
--
To view, visit https://gerrit.wikimedia.org/r/94300
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3df699d15b2af1b2a22ecd5ca908085717bd282
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: QChris <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
