ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/96005
Change subject: fix alignments in maintenance.pp
......................................................................
fix alignments in maintenance.pp
as penance for breaking the alignment in a stanza in my
previous commit :-P
Change-Id: I5b45416aefd0fcb50366fe81d6d793f823df1e0d
---
M manifests/misc/maintenance.pp
1 file changed, 197 insertions(+), 197 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/96005/1
diff --git a/manifests/misc/maintenance.pp b/manifests/misc/maintenance.pp
index 81266b8..d8ddde7 100644
--- a/manifests/misc/maintenance.pp
+++ b/manifests/misc/maintenance.pp
@@ -11,9 +11,9 @@
if $enabled == true {
file { [ '/home/mwdeploy', '/home/mwdeploy/refreshLinks' ]:
ensure => directory,
- owner => mwdeploy,
- group => mwdeploy,
- mode => 0664,
+ owner => mwdeploy,
+ group => mwdeploy,
+ mode => 0664,
}
}
@@ -23,14 +23,14 @@
$monthday = regsubst($name, '.*@', '\1')
cron { "cron-refreshlinks-${name}":
- command => "/usr/local/bin/mwscriptwikiset
refreshLinks.php ${cluster}.dblist --dfn-only >
/home/mwdeploy/refreshLinks/${name}.log 2>&1",
- user => mwdeploy,
- hour => 0,
- minute => 0,
+ command => "/usr/local/bin/mwscriptwikiset
refreshLinks.php ${cluster}.dblist --dfn-only >
/home/mwdeploy/refreshLinks/${name}.log 2>&1",
+ user => mwdeploy,
+ hour => 0,
+ minute => 0,
monthday => $monthday,
- ensure => $cronenabled ?{
- true => present,
- false => absent,
+ ensure => $cronenabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
@@ -45,27 +45,27 @@
system::role { "misc::maintenance::pagetriage": description => "Misc -
Maintenance Server: pagetriage extension" }
cron { 'pagetriage_cleanup_en':
- user => apache,
- minute => 55,
- hour => 20,
+ user => apache,
+ minute => 55,
+ hour => 20,
monthday => '*/2',
- command => '/usr/local/bin/mwscript
extensions/PageTriage/cron/updatePageTriageQueue.php enwiki >
/tmp/updatePageTriageQueue.en.log',
- ensure => $enabled ?{
- true => present,
- false => absent,
+ command => '/usr/local/bin/mwscript
extensions/PageTriage/cron/updatePageTriageQueue.php enwiki >
/tmp/updatePageTriageQueue.en.log',
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
cron { 'pagetriage_cleanup_testwiki':
- user => apache,
- minute => 55,
- hour => 14,
+ user => apache,
+ minute => 55,
+ hour => 14,
monthday => '*/2',
- command => '/usr/local/bin/mwscript
extensions/PageTriage/cron/updatePageTriageQueue.php testwiki >
/tmp/updatePageTriageQueue.test.log',
- ensure => $enabled ?{
- true => present,
- false => absent,
+ command => '/usr/local/bin/mwscript
extensions/PageTriage/cron/updatePageTriageQueue.php testwiki >
/tmp/updatePageTriageQueue.test.log',
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
@@ -78,34 +78,34 @@
cron {
translationnotifications-metawiki:
command => "/usr/local/bin/mwscript
extensions/TranslationNotifications/scripts/DigestEmailer.php --wiki metawiki
2>&1 >> /var/log/translationnotifications/digests.log",
- user => l10nupdate, # which user?
+ user => l10nupdate, # which user?
weekday => 1, # Monday
- hour => 10,
- minute => 0,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ hour => 10,
+ minute => 0,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
translationnotifications-mediawikiwiki:
command => "/usr/local/bin/mwscript
extensions/TranslationNotifications/scripts/DigestEmailer.php --wiki
mediawikiwiki 2>&1 >> /var/log/translationnotifications/digests.log",
- user => l10nupdate, # which user?
+ user => l10nupdate, # which user?
weekday => 1, # Monday
- hour => 10,
- minute => 5,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ hour => 10,
+ minute => 5,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
file {
"/var/log/translationnotifications":
- owner => l10nupdate, # user ?
- group => wikidev,
- mode => 0664,
+ owner => l10nupdate, # user ?
+ group => wikidev,
+ mode => 0664,
ensure => directory;
"/etc/logrotate.d/l10nupdate":
owner => 'root',
@@ -119,11 +119,11 @@
cron {
tor_exit_node_update:
command => "/usr/local/bin/mwscript
extensions/TorBlock/loadExitNodes.php --wiki=aawiki --force > /dev/null",
- user => apache,
- minute => '*/20',
- ensure => $enabled ?{
- true => present,
- false => absent,
+ user => apache,
+ minute => '*/20',
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
@@ -133,12 +133,12 @@
cron {
echo_mail_batch:
command => "/usr/local/bin/foreachwikiindblist
/usr/local/apache/common/echowikis.dblist
extensions/Echo/maintenance/processEchoEmailBatch.php",
- user => apache,
- minute => 0,
- hour => 0,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ user => apache,
+ minute => 0,
+ hour => 0,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
@@ -148,21 +148,21 @@
file {
"/usr/local/apache/common/php/extensions/FlaggedRevs/maintenance/wikimedia-periodic-update.sh":
source =>
"puppet:///files/misc/scripts/wikimedia-periodic-update.sh",
- owner => apache,
- group => wikidev,
- mode => 0755,
+ owner => apache,
+ group => wikidev,
+ mode => 0755,
ensure => present;
}
cron {
update_flaggedrev_stats:
command =>
"/usr/local/apache/common/php/extensions/FlaggedRevs/maintenance/wikimedia-periodic-update.sh
> /dev/null",
- user => "apache",
- hour => "*/2",
- minute => "0",
- ensure => $enabled ?{
- true => present,
- false => absent,
+ user => "apache",
+ hour => "*/2",
+ minute => "0",
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
@@ -172,12 +172,12 @@
cron {
cleanup_upload_stash:
command => "/usr/local/bin/foreachwiki
maintenance/cleanupUploadStash.php > /dev/null",
- user => "apache",
- hour => 1,
- minute => 0,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ user => "apache",
+ hour => 1,
+ minute => 0,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
@@ -186,14 +186,14 @@
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 > /var/log/updateSpecialPages.log 2>&1",
- user => "apache",
+ command => "flock -n /var/lock/update-special-pages
/usr/local/bin/update-special-pages > /var/log/updateSpecialPages.log 2>&1",
+ user => "apache",
monthday => "*/3",
- hour => 5,
- minute => 0,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ hour => 5,
+ minute => 0,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
update_special_pages_small:
@@ -203,9 +203,9 @@
file {
"/usr/local/bin/update-special-pages":
source =>
"puppet:///files/misc/scripts/update-special-pages",
- owner => apache,
- group => wikidev,
- mode => 0755,
+ owner => apache,
+ group => wikidev,
+ mode => 0755,
ensure => present;
"/usr/local/bin/update-special-pages-small":
ensure => absent;
@@ -216,11 +216,11 @@
cron {
wikibase-repo-prune:
command => "/usr/local/bin/mwscript
extensions/Wikibase/repo/maintenance/pruneChanges.php --wiki wikidatawiki
--number-of-days=3 2>&1 >> /var/log/wikidata/prune.log",
- user => mwdeploy,
- minute => [0,15,30,45],
- ensure => $enabled ?{
- true => present,
- false => absent,
+ user => mwdeploy,
+ minute => [0,15,30,45],
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
@@ -230,11 +230,11 @@
cron {
wikibase-dispatch-changes:
command => "/usr/local/bin/mwscript
extensions/Wikibase/lib/maintenance/dispatchChanges.php --wiki wikidatawiki
--max-time 900 --batch-size 200 --dispatch-interval 30 2>&1 >>
/var/log/wikidata/dispatcher.log",
- user => mwdeploy,
- minute => "*/5",
- ensure => $enabled ?{
- true => present,
- false => absent,
+ user => mwdeploy,
+ minute => "*/5",
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
@@ -242,11 +242,11 @@
cron {
wikibase-dispatch-changes2:
command => "/usr/local/bin/mwscript
extensions/Wikibase/lib/maintenance/dispatchChanges.php --wiki wikidatawiki
--max-time 900 --batch-size 200 --dispatch-interval 30 2>&1 >>
/var/log/wikidata/dispatcher2.log",
- user => mwdeploy,
- minute => "*/5",
- ensure => $enabled ?{
- true => present,
- false => absent,
+ user => mwdeploy,
+ minute => "*/5",
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
@@ -263,13 +263,13 @@
file {
"/var/log/wikidata":
- owner => mwdeploy,
- group => mwdeploy,
- mode => 0664,
+ owner => mwdeploy,
+ group => mwdeploy,
+ mode => 0664,
ensure => directory;
"/etc/logrotate.d/wikidata":
owner => 'root',
- group => 'root',
+ group => 'root',
mode => '0444',
source => 'puppet:///files/logrotate/wikidata',
}
@@ -280,15 +280,15 @@
system::role { "misc::maintenance::parsercachepurging": description =>
"Misc - Maintenance Server: parser cache purging" }
cron { 'parser_cache_purging':
- user => apache,
- minute => 0,
- hour => 1,
+ user => apache,
+ minute => 0,
+ hour => 1,
weekday => 0,
# Purge entries older than 30d * 86400s/d = 2592000s
command => '/usr/local/bin/mwscript purgeParserCache.php
--wiki=aawiki --age=2592000 >/dev/null 2>&1',
- ensure => $enabled ?{
- true => present,
- false => absent,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
@@ -298,33 +298,33 @@
class misc::maintenance::geodata( $enabled = false ) {
file {
"/usr/local/bin/update-geodata":
- ensure => present,
+ ensure => present,
content => template( "misc/update-geodata.erb" ),
- mode => 0555;
+ mode => 0555;
"/usr/local/bin/clear-killlist":
- ensure => present,
+ ensure => present,
content => template( "misc/clear-killlist.erb" ),
- mode => 0555;
+ mode => 0555;
}
cron {
"update-geodata":
command => "/usr/local/bin/update-geodata >/dev/null",
- user => apache,
- minute => "*/30",
- ensure => $enabled ?{
- true => present,
- false => absent,
+ user => apache,
+ minute => "*/30",
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
"clear-killlist":
command => "/usr/local/bin/clear-killlist >/dev/null",
- user => apache,
- hour => 8,
- minute => 45,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ user => apache,
+ hour => 8,
+ minute => 45,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
@@ -334,12 +334,12 @@
define cronjob($cronenabled) {
cron { "aft5-archivefeedback-${title}":
command => "/usr/local/bin/mwscript
extensions/ArticleFeedbackv5/maintenance/archiveFeedback.php --wiki ${title}
2>&1 > /dev/null",
- user => apache,
- hour => 7,
- minute => 4,
- ensure => $cronenabled ? {
- true => present,
- false => absent,
+ user => apache,
+ hour => 7,
+ minute => 4,
+ ensure => $cronenabled ? {
+ true => present,
+ false => absent,
default => absent
}
}
@@ -355,14 +355,14 @@
$subject = "${hostname} mail aliases"
cron { 'mail_exim_aliases':
- user => root,
- minute => 0,
- hour => 0,
+ user => root,
+ minute => 0,
+ hour => 0,
weekday => 0,
command => "/usr/bin/mail -s '${subject}' ${recipient} <
${alias_file} >/dev/null 2>&1",
- ensure => $enabled ?{
- true => present,
- false => absent,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
@@ -374,9 +374,9 @@
file { '/home/mwdeploy/updateSpecialPages':
ensure => directory,
- owner => mwdeploy,
- group => mwdeploy,
- mode => 0664,
+ owner => mwdeploy,
+ group => mwdeploy,
+ mode => 0664,
}
define updatequerypages::cronjob() {
@@ -385,68 +385,68 @@
$monthday = regsubst($name, '.*@', '\1')
Cron {
- user => mwdeploy,
- hour => 1,
- minute => 0,
+ user => mwdeploy,
+ hour => 1,
+ minute => 0,
monthday => $monthday,
}
cron { "cron-updatequerypages-ancientpages-${name}":
- command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php ${cluster}.dblist --override --only=Ancientpages >
/home/mwdeploy/updateSpecialPages/${name}-AncientPages.log 2>&1",
- month => absent,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php ${cluster}.dblist --override --only=Ancientpages >
/home/mwdeploy/updateSpecialPages/${name}-AncientPages.log 2>&1",
+ month => absent,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
cron { "cron-updatequerypages-deadendpages-${name}":
- command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php ${cluster}.dblist --override --only=Deadendpages >
/home/mwdeploy/updateSpecialPages/${name}-DeadendPages.log 2>&1",
- month => absent,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php ${cluster}.dblist --override --only=Deadendpages >
/home/mwdeploy/updateSpecialPages/${name}-DeadendPages.log 2>&1",
+ month => absent,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
cron { "cron-updatequerypages-mostlinked-${name}":
- command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php ${cluster}.dblist --override --only=Mostlinked >
/home/mwdeploy/updateSpecialPages/${name}-MostLinked.log 2>&1",
- month => absent,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php ${cluster}.dblist --override --only=Mostlinked >
/home/mwdeploy/updateSpecialPages/${name}-MostLinked.log 2>&1",
+ month => absent,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
cron { "cron-updatequerypages-mostrevisions-${name}":
- command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php ${cluster}.dblist --override --only=Mostrevisions >
/home/mwdeploy/updateSpecialPages/${name}-MostRevisions.log 2>&1",
- month => absent,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php ${cluster}.dblist --override --only=Mostrevisions >
/home/mwdeploy/updateSpecialPages/${name}-MostRevisions.log 2>&1",
+ month => absent,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
cron { "cron-updatequerypages-wantedpages-${name}":
- command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php ${cluster}.dblist --override --only=Wantedpages >
/home/mwdeploy/updateSpecialPages/${name}-WantedPages.log 2>&1",
- month => absent,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php ${cluster}.dblist --override --only=Wantedpages >
/home/mwdeploy/updateSpecialPages/${name}-WantedPages.log 2>&1",
+ month => absent,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
cron { "cron-updatequerypages-fewestrevisions-${name}":
- command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php ${cluster}.dblist --override --only=Fewestrevisions >
/home/mwdeploy/updateSpecialPages/${name}-FewestRevisions.log 2>&1",
- month => absent,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php ${cluster}.dblist --override --only=Fewestrevisions >
/home/mwdeploy/updateSpecialPages/${name}-FewestRevisions.log 2>&1",
+ month => absent,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
@@ -455,73 +455,73 @@
define updatequerypages::enwiki::cronjob() {
Cron {
- user => mwdeploy,
- hour => 1,
+ user => mwdeploy,
+ hour => 1,
minute => 0,
}
cron { "cron-updatequerypages-lonelypages-s1":
- command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php s1.dblist --override --only=Lonelypages >
/home/mwdeploy/updateSpecialPages/${name}-LonelyPages.log 2>&1",
- month => [1, 7],
- monthday => 18,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php s1.dblist --override --only=Lonelypages >
/home/mwdeploy/updateSpecialPages/${name}-LonelyPages.log 2>&1",
+ month => [1, 7],
+ monthday => 18,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
cron { "cron-updatequerypages-mostcategories-s1":
- command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php s1.dblist --override --only=Mostcategories >
/home/mwdeploy/updateSpecialPages/${name}-MostCategories.log 2>&1",
- month => [2, 8],
- monthday => 19,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php s1.dblist --override --only=Mostcategories >
/home/mwdeploy/updateSpecialPages/${name}-MostCategories.log 2>&1",
+ month => [2, 8],
+ monthday => 19,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
cron { "cron-updatequerypages-mostlinkedcategories-s1":
- command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php s1.dblist --override --only=Mostlinkedcategories >
/home/mwdeploy/updateSpecialPages/${name}-MostLinkedCategories.log 2>&1",
- month => [3, 9],
+ command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php s1.dblist --override --only=Mostlinkedcategories >
/home/mwdeploy/updateSpecialPages/${name}-MostLinkedCategories.log 2>&1",
+ month => [3, 9],
monthday => 20,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
cron { "cron-updatequerypages-mostlinkedtemplates-s1":
- command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php s1.dblist --override --only=Mostlinkedtemplates >
/home/mwdeploy/updateSpecialPages/${name}-MostLinkedTemplates.log 2>&1",
- month => [4, 10],
+ command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php s1.dblist --override --only=Mostlinkedtemplates >
/home/mwdeploy/updateSpecialPages/${name}-MostLinkedTemplates.log 2>&1",
+ month => [4, 10],
monthday => 21,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
cron { "cron-updatequerypages-uncategorizedcategories-s1":
- command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php s1.dblist --override --only=Uncategorizedcategories >
/home/mwdeploy/updateSpecialPages/${name}-UncategorizedCategories.log 2>&1",
- month => [5, 11],
+ command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php s1.dblist --override --only=Uncategorizedcategories >
/home/mwdeploy/updateSpecialPages/${name}-UncategorizedCategories.log 2>&1",
+ month => [5, 11],
monthday => 22,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
cron { "cron-updatequerypages-wantedtemplates-s1":
- command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php s1.dblist --override --only=Wantedtemplates >
/home/mwdeploy/updateSpecialPages/${name}-WantedTemplates.log 2>&1",
- month => [6, 12],
+ command => "/usr/local/bin/mwscriptwikiset
updateSpecialPages.php s1.dblist --override --only=Wantedtemplates >
/home/mwdeploy/updateSpecialPages/${name}-WantedTemplates.log 2>&1",
+ month => [6, 12],
monthday => 23,
- ensure => $enabled ?{
- true => present,
- false => absent,
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
default => absent
};
}
--
To view, visit https://gerrit.wikimedia.org/r/96005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b45416aefd0fcb50366fe81d6d793f823df1e0d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
