Use external module for cronjobs

[perso/Immae/Projets/Puppet.git] / modules / base_installation / manifests / cronie.pp

diff --git a/modules/base_installation/manifests/cronie.pp b/modules/base_installation/manifests/cronie.pp
index 2235470b6a2c93d122822b824b5f6f5e3f991e5d..3558d9f06334e51bc5f235249c284199c45e7fae 100644 (file)
--- a/modules/base_installation/manifests/cronie.pp
+++ b/modules/base_installation/manifests/cronie.pp
@@ -10,31 +10,39 @@ class base_installation::cronie inherits base_installation {
       owner   => root,
       group   => root,
     }
-    cron { 'puppet-pull-apply':
-      ensure  => present,
-      command => "cd $base_installation::puppet_code_path ; /usr/bin/git pull",
-      user    => root,
-      minute  => '*/30',
-      require => File['post-hook'],
+    cron::job { 'puppet-pull-apply':
+      ensure      => present,
+      command     => "cd $base_installation::puppet_code_path ; /usr/bin/git pull",
+      user        => root,
+      minute      => '15,45',
+      require     => File['post-hook'],
+      description => "Pull git and apply puppet changes",
     }
-    cron { 'puppet-apply':
-      ensure  => present,
-      command => "cd $base_installation::puppet_code_path ; /usr/local/sbin/puppet_apply $base_installation::puppet_code_path/manifests/site.pp",
-      user    => root,
-      minute  => '*/20'
+    cron::job::multiple { 'puppet-apply':
+      ensure => present,
+      jobs   => [
+        {
+          command     => "cd $base_installation::puppet_code_path ; /usr/local/sbin/puppet_apply $base_installation::puppet_code_path/manifests/site.pp",
+          user        => root,
+          minute      => '*/20',
+          description => "Re-apply puppet changes regularly",
+        },
+        {
+          command     => "cd $base_installation::puppet_code_path ; /usr/local/sbin/puppet_apply $base_installation::puppet_code_path/manifests/site.pp",
+          user        => root,
+          special     => "reboot",
+          description => "Re-apply puppet changes at reboot",
+        }
+      ]
     }
-    cron { 'puppet-apply-reboot':
-      ensure  => present,
-      command => "cd $base_installation::puppet_code_path ; /usr/local/sbin/puppet_apply $base_installation::puppet_code_path/manifests/site.pp",
-      user    => root,
-      special => "reboot"
-    }
-    cron { 'pacman_keys':
-      ensure  => present,
-      command => "pacman-key --populate archlinux",
-      user    => root,
-      minute  => "0",
-      hour    => "1",
+
+    cron::daily { 'pacman_keys':
+      ensure      => present,
+      command     => "pacman-key --populate archlinux",
+      user        => root,
+      minute      => "0",
+      hour        => "1",
+      description => "Populate pacman keys",
     }
   }
 }