Hello Ottomata,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/94297
to review the following change.
Change subject: Split geowiki data repository into private and public parts
......................................................................
Split geowiki data repository into private and public parts
Change-Id: I6205cbb60dbdbb50fe50c0265f04f77c6b99a9de
---
M manifests/misc/statistics.pp
1 file changed, 18 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/94297/1
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index b2f73ec..b97bdb5 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -929,30 +929,36 @@
$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_data_path = "${geowiki_base_path}/data"
+ $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_mysql_research_conf_file =
$misc::statistics::geowiki::mysql::conf::research::conf_file
- git::clone { 'geowiki-data':
- directory => $geowiki_data_path,
- origin =>
"ssh://gerrit.wikimedia.org:29418/analytics/geowiki-data.git",
- # As geowiki-data currently does not exist in gerrit, requiring the
- # latest version would break puppet's the dependecy chain. So we'll not
- # 'ensure => latest' until the repo comes back in gerrit.
- ensure => 'present',
+ 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,
}
# cron job to do the actual fetching from the database, computation of
- # the limn files, and pushing the limn files to the geowiki-data
- # repository.
+ # the limn files, and pushing the limn files to the data repositories
cron { 'geowiki-process-db-to-limn':
minute => 0,
hour => 15,
user => $geowiki_user,
- command =>
"${geowiki_scripts_path}/scripts/make_and_push_limn_files.sh --cron-mode
--basedir=${geowiki_data_path}
--source_sql_cnf=${geowiki_mysql_research_conf_file}",
+ command =>
"${geowiki_scripts_path}/scripts/make_and_push_limn_files.sh --cron-mode
--basedir_public=${geowiki_public_data_path}
--basedir_private=${geowiki_private_data_path}
--source_sql_cnf=${geowiki_mysql_research_conf_file}",
require => [
Git::Clone['geowiki-scripts'],
- Git::Clone['geowiki-data'],
+ Git::Clone['geowiki-data-public'],
+ Git::Clone['geowiki-data-private'],
File[$geowiki_mysql_research_conf_file],
],
ensure => absent,
--
To view, visit https://gerrit.wikimedia.org/r/94297
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6205cbb60dbdbb50fe50c0265f04f77c6b99a9de
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
