Yuvipanda has submitted this change and it was merged.
Change subject: General maintenance script cleanup
......................................................................
General maintenance script cleanup
* Remove random nonsensical reference to pmtpa DB slaves
* Add test2wiki to the list of wikis with PageTriage cronjobs
* Replace files/misc/scripts/update-special-pages with a call to foreachwiki
* Replace files/misc/scripts/wikimedia-periodic-update.sh with a call to
mwscriptwikiset extensions/FlaggedRevs/maintenance/updateStats.php
flaggedrevs.dblist
Change-Id: I751ffb047bb586061408be9818ff87f782db1c38
---
D files/misc/scripts/update-special-pages
D files/misc/scripts/wikimedia-periodic-update.sh
M manifests/misc/maintenance.pp
M manifests/site.pp
4 files changed, 11 insertions(+), 36 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/misc/scripts/update-special-pages
b/files/misc/scripts/update-special-pages
deleted file mode 100755
index 0892bd6..0000000
--- a/files/misc/scripts/update-special-pages
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-. /etc/profile.d/mediawiki.sh
-
-cd "$MEDIAWIKI_DEPLOYMENT_DIR/multiversion"
-for db in `<"$MEDIAWIKI_DEPLOYMENT_DIR/all.dblist"`; do
- echo $db
- php MWScript.php updateSpecialPages.php $db
- echo
- echo
-done
diff --git a/files/misc/scripts/wikimedia-periodic-update.sh
b/files/misc/scripts/wikimedia-periodic-update.sh
deleted file mode 100644
index 70808e2..0000000
--- a/files/misc/scripts/wikimedia-periodic-update.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-. /etc/profile.d/mediawiki.sh
-
-for db in `<"$MEDIAWIKI_DEPLOYMENT_DIR/flaggedrevs.dblist"`;do
- echo $db
- php $MEDIAWIKI_DEPLOYMENT_DIR/multiversion/MWScript.php
extensions/FlaggedRevs/maintenance/updateStats.php $db
-done
diff --git a/manifests/misc/maintenance.pp b/manifests/misc/maintenance.pp
index 03a82af..a783976 100644
--- a/manifests/misc/maintenance.pp
+++ b/manifests/misc/maintenance.pp
@@ -63,6 +63,15 @@
monthday => '*/2',
command => '/usr/local/bin/mwscript
extensions/PageTriage/cron/updatePageTriageQueue.php testwiki >
/var/log/mediawiki/updatePageTriageQueue.test.log',
}
+
+ cron { 'pagetriage_cleanup_test2wiki':
+ ensure => $ensure,
+ user => $::mediawiki::users::web,
+ minute => 55,
+ hour => 8,
+ monthday => '*/2',
+ command => '/usr/local/bin/mwscript
extensions/PageTriage/cron/updatePageTriageQueue.php test2wiki >
/var/log/mediawiki/updatePageTriageQueue.test2.log',
+ }
}
class misc::maintenance::translationnotifications( $ensure = present ) {
@@ -124,17 +133,10 @@
}
class misc::maintenance::update_flaggedrev_stats( $ensure = present ) {
- file {
'/srv/mediawiki/php/extensions/FlaggedRevs/maintenance/wikimedia-periodic-update.sh':
- ensure => $ensure,
- source => 'puppet:///files/misc/scripts/wikimedia-periodic-update.sh',
- owner => 'root',
- group => 'root',
- mode => '0555',
- }
cron { 'update_flaggedrev_stats':
ensure => $ensure,
- command =>
'/srv/mediawiki/php/extensions/FlaggedRevs/maintenance/wikimedia-periodic-update.sh
> /dev/null',
+ command => '/usr/local/bin/mwscriptwikiset
extensions/FlaggedRevs/maintenance/updateStats.php flaggedrevs.dblist >
/dev/null',
user => $::mediawiki::users::web,
hour => '*/2',
minute => '0',
@@ -154,19 +156,11 @@
class misc::maintenance::update_special_pages( $ensure = present ) {
cron { 'update_special_pages':
ensure => $ensure,
- command => 'flock -n /var/lock/update-special-pages
/usr/local/bin/update-special-pages > /var/log/mediawiki/updateSpecialPages.log
2>&1',
+ command => 'flock -n /var/lock/update-special-pages
/usr/local/bin/foreachwiki updateSpecialPages.php >
/var/log/mediawiki/updateSpecialPages.log 2>&1',
user => $::mediawiki::users::web,
monthday => '*/3',
hour => 5,
minute => 0,
- }
-
- file { '/usr/local/bin/update-special-pages':
- ensure => $ensure,
- source => 'puppet:///files/misc/scripts/update-special-pages',
- owner => 'root',
- group => 'root',
- mode => '0555',
}
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 447dd97..9b37439 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2289,7 +2289,6 @@
}
# (T17434) Periodical run of currently disabled special pages
- # to be run against PMTPA slaves
include misc::maintenance::updatequerypages
package { 'python-mysqldb':
--
To view, visit https://gerrit.wikimedia.org/r/232871
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I751ffb047bb586061408be9818ff87f782db1c38
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
