[MediaWiki-commits] [Gerrit] Move non geodata cron jobs to terbium - change (operations/puppet)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/62526


Change subject: Move non geodata cron jobs to terbium
......................................................................

Move non geodata cron jobs to terbium

Move location of wikimedia-periodic-update.sh to /usr/local/bin/

Drop log for update special pages

Change-Id: I4b3351ff7a81e92ff0fae1519dfbeade92ff7f40
---
M manifests/misc/maintenance.pp
M manifests/site.pp
2 files changed, 9 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/62526/1

diff --git a/manifests/misc/maintenance.pp b/manifests/misc/maintenance.pp
index 7a532e3..187303d 100644
--- a/manifests/misc/maintenance.pp
+++ b/manifests/misc/maintenance.pp
@@ -171,7 +171,7 @@
 
 class misc::maintenance::update_flaggedrev_stats( $enabled = false ) {
        file {
-               
"/usr/local/apache/common/php/extensions/FlaggedRevs/maintenance/wikimedia-periodic-update.sh":
+               "/usr/local/bin/wikimedia-periodic-update.sh":
                        source => 
"puppet:///files/misc/scripts/wikimedia-periodic-update.sh",
                        owner => apache,
                        group => wikidev,
@@ -181,7 +181,7 @@
 
        cron {
                update_flaggedrev_stats:
-                       command => 
"/usr/local/apache/common/php/extensions/FlaggedRevs/maintenance/wikimedia-periodic-update.sh
 > /dev/null",
+                       command => "/usr/local/bin/wikimedia-periodic-update.sh 
> /dev/null",
                        user => "apache",
                        hour => "*/2",
                        minute => "0",
@@ -211,7 +211,7 @@
 class misc::maintenance::update_special_pages( $enabled = false ) {
        cron {
                update_special_pages:
-                       command => "flock -n /var/lock/update-special-pages 
/usr/local/bin/update-special-pages > 
/home/wikipedia/logs/norotate/updateSpecialPages.log 2>&1",
+                       command => "flock -n /var/lock/update-special-pages 
/usr/local/bin/update-special-pages > /dev/null",
                        user => "apache",
                        monthday => "*/3",
                        hour => 5,
diff --git a/manifests/site.pp b/manifests/site.pp
index a8629ac..8374ef3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1114,20 +1114,12 @@
        class { misc::maintenance::parsercachepurging: enabled => false }
        class { misc::maintenance::cleanup_upload_stash: enabled => false }
        class { misc::maintenance::tor_exit_node: enabled => false }
-
-       # These cron jobs were left behind for some reason:
+       class { misc::maintenance::update_special_pages: enabled => false }
+       class { misc::maintenance::update_flaggedrev_stats: enabled => false }
+       class { misc::maintenance::refreshlinks: enabled => false }
 
        # foreachwikiindblist broken
        class { misc::maintenance::geodata: enabled => true }
-
-       # Wrong log file location
-       class { misc::maintenance::update_special_pages: enabled => true }
-
-       # wikimedia-periodic-update.sh is unpuppetized and not in the scap 
source
-       class { misc::maintenance::update_flaggedrev_stats: enabled => true }
-
-       # Unknown issue, works for me
-       class { misc::maintenance::refreshlinks: enabled => true }
 }
 
 node "iron.wikimedia.org" {
@@ -2727,14 +2719,12 @@
        class { misc::maintenance::parsercachepurging: enabled => true }
        class { misc::maintenance::cleanup_upload_stash: enabled => true }
        class { misc::maintenance::tor_exit_node: enabled => true }
+       class { misc::maintenance::update_special_pages: enabled => true }
+       class { misc::maintenance::update_flaggedrev_stats: enabled => true }
+       class { misc::maintenance::refreshlinks: enabled => true }
 
        # Broken cron jobs moved back to hume:
        class { misc::maintenance::geodata: enabled => false }
-       class { misc::maintenance::update_special_pages: enabled => false }
-
-       class { misc::maintenance::update_flaggedrev_stats: enabled => false }
-       class { misc::maintenance::refreshlinks: enabled => false }
-
 }
 
 node "tin.eqiad.wmnet" {

-- 
To view, visit https://gerrit.wikimedia.org/r/62526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b3351ff7a81e92ff0fae1519dfbeade92ff7f40
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy <re...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits