ArielGlenn has submitted this change and it was merged.

Change subject: fix alignments in maintenance.pp and tabs->spaces
......................................................................


fix alignments in maintenance.pp and tabs->spaces

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, 371 insertions(+), 371 deletions(-)

Approvals:
  ArielGlenn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/misc/maintenance.pp b/manifests/misc/maintenance.pp
index 81266b8..f8d8ad0 100644
--- a/manifests/misc/maintenance.pp
+++ b/manifests/misc/maintenance.pp
@@ -4,368 +4,368 @@
 
 class misc::maintenance::refreshlinks( $enabled = false ) {
 
-       require mediawiki
+    require mediawiki
 
-       # Include this to add cron jobs calling refreshLinks.php on all 
clusters. (RT-2355)
+    # Include this to add cron jobs calling refreshLinks.php on all clusters. 
(RT-2355)
 
-       if $enabled == true {
-               file { [ '/home/mwdeploy', '/home/mwdeploy/refreshLinks' ]:
-                       ensure => directory,
-                       owner => mwdeploy,
-                       group => mwdeploy,
-                       mode => 0664,
-               }
-       }
+    if $enabled == true {
+        file { [ '/home/mwdeploy', '/home/mwdeploy/refreshLinks' ]:
+            ensure => directory,
+            owner  => mwdeploy,
+            group  => mwdeploy,
+            mode   => 0664,
+        }
+    }
 
-       define cronjob( $cronenabled = $enabled ) {
+    define cronjob( $cronenabled = $enabled ) {
 
-               $cluster = regsubst($name, '@.*', '\1')
-               $monthday = regsubst($name, '.*@', '\1')
+        $cluster = regsubst($name, '@.*', '\1')
+        $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,
-                       monthday => $monthday,
-                       ensure => $cronenabled ?{
-                               true => present,
-                               false => absent,
-                               default => absent
-                       };
-               }
-       }
+        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,
+            monthday => $monthday,
+            ensure   => $cronenabled ?{
+                true    => present,
+                false   => absent,
+                default => absent
+            };
+        }
+    }
 
-       # add cron jobs - usage: <cluster>@<day of month> (these are just 
needed monthly) (note: s1 is temp. deactivated)
-       cronjob { ['s2@2', 's3@3', 's4@4', 's5@5', 's6@6', 's7@7']: }
+    # add cron jobs - usage: <cluster>@<day of month> (these are just needed 
monthly) (note: s1 is temp. deactivated)
+    cronjob { ['s2@2', 's3@3', 's4@4', 's5@5', 's6@6', 's7@7']: }
 }
 
 class misc::maintenance::pagetriage( $enabled = false ) {
 
-       system::role { "misc::maintenance::pagetriage": description => "Misc - 
Maintenance Server: pagetriage extension" }
+    system::role { "misc::maintenance::pagetriage": description => "Misc - 
Maintenance Server: pagetriage extension" }
 
-       cron { 'pagetriage_cleanup_en':
-               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,
-                       default => absent
-               };
-       }
+    cron { 'pagetriage_cleanup_en':
+        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,
+            default => absent
+        };
+    }
 
-       cron { 'pagetriage_cleanup_testwiki':
-               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,
-                       default => absent
-               };
-       }
+    cron { 'pagetriage_cleanup_testwiki':
+        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,
+            default => absent
+        };
+    }
 }
 
 class misc::maintenance::translationnotifications( $enabled = false ) {
-       # Should there be crontab entry for each wiki,
-       # or just one which runs the scripts which iterates over
-       # selected set of wikis?
-       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?
-                       weekday => 1, # Monday
-                       hour => 10,
-                       minute => 0,
-                       ensure => $enabled ?{
-                               true => present,
-                               false => absent,
-                               default => absent
-                       };
+    # Should there be crontab entry for each wiki,
+    # or just one which runs the scripts which iterates over
+    # selected set of wikis?
+    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?
+            weekday => 1, # Monday
+            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?
-                       weekday => 1, # Monday
-                       hour => 10,
-                       minute => 5,
-                       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?
+            weekday => 1, # Monday
+            hour    => 10,
+            minute  => 5,
+            ensure  => $enabled ?{
+                true    => present,
+                false   => absent,
+                default => absent
+            };
+    }
 
-       file {
-               "/var/log/translationnotifications":
-                       owner => l10nupdate, # user ?
-                       group => wikidev,
-                       mode => 0664,
-                       ensure => directory;
-               "/etc/logrotate.d/l10nupdate":
-                       owner  => 'root',
-                       group  => 'root',
-                       mode   => '0444',
-                       source => 
"puppet:///files/logrotate/translationnotifications",
-       }
+    file {
+        "/var/log/translationnotifications":
+            owner  => l10nupdate, # user ?
+            group  => wikidev,
+            mode   => 0664,
+            ensure => directory;
+        "/etc/logrotate.d/l10nupdate":
+            owner  => 'root',
+            group  => 'root',
+            mode   => '0444',
+            source => "puppet:///files/logrotate/translationnotifications",
+    }
 }
 
 class misc::maintenance::tor_exit_node( $enabled = false ) {
-       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,
-                               default => absent
-                       };
-       }
+    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,
+                default => absent
+            };
+    }
 }
 
 class misc::maintenance::echo_mail_batch( $enabled = false ) {
-       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,
-                               default => absent
-                       };
-       }
+    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,
+                default => absent
+            };
+    }
 }
 
 class misc::maintenance::update_flaggedrev_stats( $enabled = false ) {
-       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,
-                       ensure => present;
-       }
+    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,
+            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,
-                               default => absent
-                       };
-       }
+    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,
+                default => absent
+            };
+    }
 }
 
 class misc::maintenance::cleanup_upload_stash( $enabled = false ) {
-       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,
-                               default => absent
-                       };
-       }
+    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,
+                default => absent
+            };
+    }
 }
 
 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",
-                       monthday => "*/3",
-                       hour => 5,
-                       minute => 0,
-                       ensure => $enabled ?{
-                               true => present,
-                               false => absent,
-                               default => absent
-                       };
-               update_special_pages_small:
-                       ensure => absent;
-       }
+    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",
+            monthday => "*/3",
+            hour     => 5,
+            minute   => 0,
+            ensure   => $enabled ?{
+                true    => present,
+                false   => absent,
+                default => absent
+            };
+        update_special_pages_small:
+            ensure => absent;
+    }
 
-       file {
-               "/usr/local/bin/update-special-pages":
-                       source => 
"puppet:///files/misc/scripts/update-special-pages",
-                       owner => apache,
-                       group => wikidev,
-                       mode => 0755,
-                       ensure => present;
-               "/usr/local/bin/update-special-pages-small":
-                       ensure => absent;
-       }
+    file {
+        "/usr/local/bin/update-special-pages":
+            source => "puppet:///files/misc/scripts/update-special-pages",
+            owner  => apache,
+            group  => wikidev,
+            mode   => 0755,
+            ensure => present;
+        "/usr/local/bin/update-special-pages-small":
+            ensure => absent;
+    }
 }
 
 class misc::maintenance::wikidata( $enabled = false ) {
-       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,
-                               default => absent
-                       };
-       }
+    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,
+                default => absent
+            };
+    }
 
-       # Run the dispatcher script every 5 minutes
-       # This handles inserting jobs into client job queue, which then process 
the changes
-       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,
-                               default => absent
-                       };
-       }
+    # Run the dispatcher script every 5 minutes
+    # This handles inserting jobs into client job queue, which then process 
the changes
+    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,
+                default => absent
+            };
+    }
 
-       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,
-                               default => absent
-                       };
-       }
+    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,
+                default => absent
+            };
+    }
 
-       cron {
-               wikibase-poll-test2:
-                       ensure => absent;
-       }
+    cron {
+        wikibase-poll-test2:
+            ensure => absent;
+    }
 
-       cron {
-               wikibase-poll-huwiki:
-                       ensure => absent;
-       }
+    cron {
+        wikibase-poll-huwiki:
+            ensure => absent;
+    }
 
-       file {
-               "/var/log/wikidata":
-                       owner => mwdeploy,
-                       group => mwdeploy,
-                       mode => 0664,
-                       ensure => directory;
-               "/etc/logrotate.d/wikidata":
-                       owner  => 'root',
-                       group   => 'root',
-                       mode   => '0444',
-                       source => 'puppet:///files/logrotate/wikidata',
-       }
+    file {
+        "/var/log/wikidata":
+            owner  => mwdeploy,
+            group  => mwdeploy,
+            mode   => 0664,
+            ensure => directory;
+        "/etc/logrotate.d/wikidata":
+            owner  => 'root',
+            group  => 'root',
+            mode   => '0444',
+            source => 'puppet:///files/logrotate/wikidata',
+    }
 }
 
 class misc::maintenance::parsercachepurging( $enabled = false ) {
 
-       system::role { "misc::maintenance::parsercachepurging": description => 
"Misc - Maintenance Server: parser cache purging" }
+    system::role { "misc::maintenance::parsercachepurging": description => 
"Misc - Maintenance Server: parser cache purging" }
 
-       cron { 'parser_cache_purging':
-               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,
-                       default => absent
-               };
-       }
+    cron { 'parser_cache_purging':
+        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,
+            default => absent
+        };
+    }
 
 }
 
 class misc::maintenance::geodata( $enabled = false ) {
-       file {
-               "/usr/local/bin/update-geodata":
-                       ensure => present,
-                       content => template( "misc/update-geodata.erb" ),
-                       mode => 0555;
-               "/usr/local/bin/clear-killlist":
-                       ensure => present,
-                       content => template( "misc/clear-killlist.erb" ),
-                       mode => 0555;
-       }
+    file {
+        "/usr/local/bin/update-geodata":
+            ensure  => present,
+            content => template( "misc/update-geodata.erb" ),
+            mode    => 0555;
+        "/usr/local/bin/clear-killlist":
+            ensure  => present,
+            content => template( "misc/clear-killlist.erb" ),
+            mode    => 0555;
+    }
 
-       cron {
-               "update-geodata":
-                       command => "/usr/local/bin/update-geodata >/dev/null",
-                       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,
-                               default => absent
-                       };
-       }
+    cron {
+        "update-geodata":
+            command => "/usr/local/bin/update-geodata >/dev/null",
+            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,
+                default => absent
+            };
+    }
 }
 
 class misc::maintenance::aft5($enabled=false) {
-       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,
-                               default => absent
-                       }
-               }
-       }
+    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,
+                default => absent
+            }
+        }
+    }
 
-       cronjob{ ["enwiki", "dewiki", "frwiki"]: cronenabled => $enabled }
+    cronjob{ ["enwiki", "dewiki", "frwiki"]: cronenabled => $enabled }
 }
 
 class misc::maintenance::mail_exim_aliases( $enabled = false ) {
 
-       $alias_file = '/etc/exim4/aliases/wikimedia.org'
-       $recipient  = 'offic...@wikimedia.org'
-       $subject    = "${hostname} mail aliases"
+    $alias_file = '/etc/exim4/aliases/wikimedia.org'
+    $recipient  = 'offic...@wikimedia.org'
+    $subject    = "${hostname} mail aliases"
 
-       cron { 'mail_exim_aliases':
-               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,
-                       default => absent
-               };
-       }
+    cron { 'mail_exim_aliases':
+        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,
+            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: merged
Gerrit-Change-Id: I5b45416aefd0fcb50366fe81d6d793f823df1e0d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

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

Reply via email to