MirrorBrain: redo cron jobs

1 files changed, 51 insertions, 11 deletions

diff --git a/modules/mirrorbrain/manifests/init.pp b/modules/mirrorbrain/manifests/init.pp
index b5139e6d..9c238f20 100644
--- a/modules/mirrorbrain/manifests/init.pp
+++ b/modules/mirrorbrain/manifests/init.pp
@@ -78,7 +78,8 @@ class mirrorbrain {
         webapp_file => 'mirrorbrain/webapp.conf',
     }
 
-    cron { 'GeoIP update':
+    # Update GeoIP db
+    cron { 'MirrorBrain: weekly GeoIP update':
         command => 'sleep $(($RANDOM/1024)); /usr/bin/geoip-lite-update',
         user    => 'root',
         minute  => 30,
@@ -86,29 +87,68 @@ class mirrorbrain {
         weekday => 0
     }
 
-    #cron { 'fake mirror update':
-    #    command => "/usr/bin/null-rsync rsync.mageia.org::mageia ${mb_repo}/",
-    #    user    => "$mb_user",
-    #    minute  => 5
-    #}
+    # distrib tree
+    # mga 1-4 are frozen, so only one manual run has been done
+    # distrib/5 still active
+    cron { 'MirrorBrain: Sync Mga 5 every 4 hours ':
+        command => "/usr/bin/null-rsync rsync.mageia.org::mageia/distrib/5 ${mb_repo}/distrib/",
+        user    => "$mb_user",
+        minute  => '15',
+        hour    => '*/4',
+    }
+
+    # distrib/cauldron
+    cron { 'MirrorBrain: Sync Cauldron every 1 hours ':
+        command => "/usr/bin/null-rsync rsync.mageia.org::mageia/distrib/cauldron ${mb_repo}/distrib/",
+        user    => "$mb_user",
+        minute  => '0',
+        hour    => '*/1',
+    }
+
+    # iso tree
+    cron { 'MirrorBrain: Sync iso tree every 1 day ':
+        command => "/usr/bin/null-rsync rsync.mageia.org::mageia/iso ${mb_repo}/",
+        user    => "$mb_user",
+        hour    => '2',
+        minute  => '30',
+    }
 
-    cron { 'mirror online status check':
+    # people tree
+    cron { 'MirrorBrain: Sync people tree every 1 day ':
+        command => "/usr/bin/null-rsync rsync.mageia.org::mageia/people ${mb_repo}/",
+        user    => "$mb_user",
+        hour    => '3',
+        minute  => '45',
+    }
+
+    # software tree
+    cron { 'MirrorBrain: Sync software tree every 1 day ':
+        command => "/usr/bin/null-rsync rsync.mageia.org::mageia/software ${mb_repo}/",
+        user    => "$mb_user",
+        hour    => '4',
+        minute  => '45',
+    }
+
+    # Mirror online check
+    cron { 'MirrorBrain: mirror online status check every 5 minute':
         command => '/usr/bin/mirrorprobe',
         user    => "$mb_user",
         minute  => 5
     }
 
-    cron { 'mirror scanning':
+    # Mirror scanning
+    cron { 'MirrorBrain: mirror scanning every 30 minute':
         command => '/usr/bint/mb scan --quiet --jobs 4 --all',
         user    => "$mb_user",
         minute  => 30
     }
 
-    cron { 'mirror database cleanup':
+    # Mirror database cleanup
+    cron { 'MirrorBrain: mirror database cleanup every 1 week':
         command => '/usr/bin/mb db vacuum',
         user    => "$mb_user",
-        minute  => 30,
-        hour    => 2,
+        minute  => 45,
+        hour    => 5,
         weekday => 1
     }
 }