add two job running crons on both servers

miraheze · Aug 14, 2016 · 8a715f9 · 8a715f9
1 parent 362c9ef
commit 8a715f9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/modules/mediawiki/manifests/init.pp b/modules/mediawiki/manifests/init.pp
@@ -8,6 +8,14 @@
 
     if hiera(jobrunner) {
         include mediawiki::jobrunner
+    } else {
+        # Add a cron to run htmlCacheUpdate on all non-jobrunner servers
+        cron { 'jobqueue_cache':
+            ensure  => present,
+            command => '/usr/local/bin/foreachwikiindblist /srv/mediawiki/dblist/all.dblist /srv/mediawiki/w/maintenance/runJobs.php --type htmlCacheUpdate',
+            user    => 'www-data',
+            minute  => [ 5, 15, 25, 35, 45, 55 ],
+        }
     }
 
     file { [ '/srv/mediawiki', '/srv/mediawiki/dblist', '/var/log/mediawiki' ]:

diff --git a/modules/mediawiki/manifests/jobrunner.pp b/modules/mediawiki/manifests/jobrunner.pp
@@ -31,12 +31,16 @@
         source  => 'puppet:///modules/mediawiki/jobrunner/jobrunner.systemd',
         notify  => Exec['JobRunner reload systemd'],
     }
+
+    service { 'jobrunner':
+        ensure => stopped,
+    }
 
     cron { 'jobqueue':
-        ensure  => absent,
+        ensure  => present,
         command => '/usr/local/bin/foreachwikiindblist /srv/mediawiki/dblist/all.dblist /srv/mediawiki/w/maintenance/runJobs.php > /var/log/mediawiki/cron/jobqueue.log',
         user    => 'www-data',
-        minute  => '*/15',
+        minute  => '*/10',
     }
 
     cron { 'purge_checkuser':