Ottomata has submitted this change and it was merged.
Change subject: Rsync geowiki's bare data-private repository to statistics'
webservers
......................................................................
Rsync geowiki's bare data-private repository to statistics' webservers
Andrew said that we can trust the network, so there is no need to
encrypt the data when bringing it over to other hosts.
Change-Id: If57d2f42c59d24c1e5813da66a66fbea66a240bd
---
M manifests/misc/statistics.pp
M manifests/role/statistics.pp
2 files changed, 37 insertions(+), 2 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index 1ce1a33..e7cb365 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -863,6 +863,38 @@
}
}
+# == Class misc::statistics::geowiki::data::private_bare::sync
+# Makes sure the geowiki's bare data-private repository is available.
+#
+class misc::statistics::geowiki::data::private_bare::sync {
+ require misc::statistics::geowiki
+
+ $geowiki_user = $misc::statistics::geowiki::geowiki_user
+ $geowiki_base_path = $misc::statistics::geowiki::geowiki_base_path
+ $geowiki_private_data_bare_path = "${geowiki_base_path}/data-private-bare"
+ $geowiki_private_data_bare_host = "stat1"
+ $geowiki_private_data_bare_host_fqdn =
"${geowiki_private_data_bare_host}.wikimedia.org"
+
+ file { "$geowiki_private_data_bare_path":
+ ensure => directory,
+ owner => $geowiki_user,
+ group => $geowiki_user,
+ mode => '0640',
+ }
+
+ # The bare repository lives on stat1, so it's available there directly.
+ # Other hosts need to rsync it over
+ if $::hostname != $geowiki_private_data_bare_host {
+ cron { 'geowiki data-private bare sync':
+ command => "/usr/bin/rsync -rt --delete
rsync://${geowiki_private_data_bare_host_fqdn}${geowiki_private_data_bare_path}
${geowiki_private_data_bare_path}",
+ require => File["$geowiki_private_data_bare_path"],
+ user => 'root',
+ hour => '17',
+ minute => '0',
+ }
+ }
+}
+
# == Class misc::statistics::geowiki::jobs::data
# Installs a cron job to get recent editor data
# from the research slave databases and generate
@@ -922,6 +954,7 @@
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::packages::python
$geowiki_user = $misc::statistics::geowiki::geowiki_user
@@ -929,7 +962,7 @@
$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 = "${geowiki_base_path}/data-private-bare"
+ $geowiki_private_data_bare_path =
$misc::statistics::geowiki::data::private_bare::sync::geowiki_private_data_bare_path
$geowiki_mysql_research_conf_file =
$misc::statistics::geowiki::mysql::conf::research::conf_file
git::clone { 'geowiki-data-public':
diff --git a/manifests/role/statistics.pp b/manifests/role/statistics.pp
index 419c264..a15111f 100644
--- a/manifests/role/statistics.pp
+++ b/manifests/role/statistics.pp
@@ -45,7 +45,9 @@
# reportcard.wikimedia.org
misc::statistics::sites::reportcard,
# rsync public datasets from stat1 hourly
- misc::statistics::public_datasets
+ misc::statistics::public_datasets,
+ # rsync geowiki's bare data-private from stat1 daily
+ misc::statistics::geowiki::data::private_bare::sync
}
class role::statistics::private inherits role::statistics {
--
To view, visit https://gerrit.wikimedia.org/r/94299
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If57d2f42c59d24c1e5813da66a66fbea66a240bd
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
