QChris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/100747
Change subject: Reconfigure and turn on geowiki monitoring again
......................................................................
Reconfigure and turn on geowiki monitoring again
Card: Analytics 1253
Change-Id: Ic57fb21d39bc315f3674b8a1f3eb1dfb0abed69e
---
M manifests/misc/statistics.pp
1 file changed, 17 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/100747/1
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index 6ef6814..9102f1b 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -1048,20 +1048,32 @@
# Disabled for now due to restructuring of geowiki.
#
class misc::statistics::geowiki::jobs::monitoring {
- require misc::statistics::geowiki
+ require misc::statistics::geowiki,
+ passwords::geowiki
$geowiki_user = $misc::statistics::geowiki::geowiki_user
$geowiki_scripts_path = $misc::statistics::geowiki::geowiki_scripts_path
- # cron job to fetch geowiki data via http://gp.wmflabs.org/
+ $geowiki_http_user = $passwords::geowiki::user
+ $geowiki_http_pass = $passwords::geowiki::pass
+
+ $geowiki_http_password_file = "${geowiki_base_path}/.http_password"
+
+ file { $geowiki_http_password_file
+ owner => "$geowiki_user",
+ group => "$geowiki_user",
+ mode => '0400',
+ content => "$geowiki_http_pass",
+ }
+
+ # cron job to fetch geowiki data via http://gp.wmflabs.org/ (public data)
+ # and https://stats.wikimedia/geowiki-private (private data)
# and checks that the files are up-to-date and within
# meaningful ranges.
cron { 'geowiki-monitoring':
minute => 30,
hour => 21,
user => $geowiki_user,
- command => "${geowiki_scripts_path}/scripts/check_web_page.sh",
- # Disabled for now due to restructuring of geowiki
- ensure => absent,
+ command => "${geowiki_scripts_path}/scripts/check_web_page.sh
--private-part-user ${geowiki_http_user} --private-part-password-file
${geowiki_http_password_file}",
}
}
--
To view, visit https://gerrit.wikimedia.org/r/100747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic57fb21d39bc315f3674b8a1f3eb1dfb0abed69e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris <christ...@quelltextlich.at>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
