Ottomata has submitted this change and it was merged.
Change subject: Move geowiki's name for globaldev MySQL config into separate
variable
......................................................................
Move geowiki's name for globaldev MySQL config into separate variable
This rephrasing makes follow-up commits that move files around more
readable.
Change-Id: I4edca7388c0effaad5cd1bb03d27c648158478e3
---
M manifests/misc/statistics.pp
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index 18bcfcd..5474528 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -883,7 +883,8 @@
$globaldev_mysql_user = $passwords::mysql::globaldev::user
$globaldev_mysql_pass = $passwords::mysql::globaldev::pass
- file { "${geowiki_path}/.globaldev.my.cnf":
+ $geowiki_mysql_globaldev_conf_file = "${geowiki_path}/.globaldev.my.cnf"
+ file { $geowiki_mysql_globaldev_conf_file:
owner => $geowiki_user,
group => $geowiki_user,
mode => '0400',
@@ -909,7 +910,7 @@
minute => 0,
hour => 12,
user => $geowiki_user,
- command => "/usr/bin/python ${geowiki_path}/geowiki/process_data.py -o
${$geowiki_backups_path} --wpfiles ${geowiki_path}/geowiki/data/all_ids.tsv
--daily --start=`date --date='-2 day' +\\%Y-\\%m-\\%d` --end=`date --date='0
day' +\\%Y-\\%m-\\%d` --source_sql_cnf=${geowiki_path}/.globaldev.my.cnf
--dest_sql_cnf=${geowiki_mysql_research_conf_file}",
+ command => "/usr/bin/python ${geowiki_path}/geowiki/process_data.py -o
${$geowiki_backups_path} --wpfiles ${geowiki_path}/geowiki/data/all_ids.tsv
--daily --start=`date --date='-2 day' +\\%Y-\\%m-\\%d` --end=`date --date='0
day' +\\%Y-\\%m-\\%d` --source_sql_cnf=${geowiki_mysql_globaldev_conf_file}
--dest_sql_cnf=${geowiki_mysql_research_conf_file}",
require => File[$geowiki_backups_path],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/94292
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4edca7388c0effaad5cd1bb03d27c648158478e3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
