Hello Ottomata,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/94294
to review the following change.
Change subject: Move geowiki scripts into geowiki's scripts subdirectory
......................................................................
Move geowiki scripts into geowiki's scripts subdirectory
Since we'll be adding a repo for geowiki's private data, and a bare
repo for it, following the current layout, we'd arrive at:
/a/geowiki
/a/geowiki-data-public
/a/geowiki-data-private
/a/geowiki-data-private.bare
. Four geowiki directories in /a seems too much. So we move
/a/geowiki -> /a/geowiki/scripts, and can work towards having all of
them underneath /a/geowiki:
/a/geowiki/scripts
/a/geowiki/data-public
/a/geowiki/data-private
/a/geowiki/data-private.bare
Change-Id: Ib7bada6e099a2f05a7b459cc96fbc6d21f43f23c
---
M manifests/misc/statistics.pp
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/94294/1
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index 163a413..6104dfe 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -821,9 +821,9 @@
$geowiki_user = $misc::statistics::user::username
$geowiki_base_path = '/a/geowiki'
- $geowiki_scripts_path = "${geowiki_base_path}"
+ $geowiki_scripts_path = "${geowiki_base_path}/scripts"
- git::clone { 'geowiki':
+ git::clone { 'geowiki-scripts':
directory => $geowiki_scripts_path,
origin => "https://gerrit.wikimedia.org/r/p/analytics/geowiki.git";,
ensure => 'latest',
@@ -950,7 +950,7 @@
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}",
require => [
- Git::Clone['geowiki'],
+ Git::Clone['geowiki-scripts'],
Git::Clone['geowiki-data'],
File[$geowiki_mysql_research_conf_file],
],
--
To view, visit https://gerrit.wikimedia.org/r/94294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7bada6e099a2f05a7b459cc96fbc6d21f43f23c
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
