Merge branch 'backup' into dev

[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 bcdd9a75f3661b31bd6fdc295934f77b72fd9563..e8f3e20eb456d8d87257812879d4f07897f02796 100644 (file)
--- a/modules/base_installation/manifests/cronie.pp
+++ b/modules/base_installation/manifests/cronie.pp
@@ -10,12 +10,31 @@ class base_installation::cronie inherits base_installation {
       owner   => root,
       group   => root,
     }
-    cron { 'puppet-apply':
+    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 { 'puppet-apply':
+      ensure  => present,
+      command => "cd $base_installation::puppet_code_path ; puppet_apply $base_installation::puppet_code_path/manifests/site.pp",
+      user    => root,
+      minute  => '*/20'
+    }
+    cron { 'puppet-apply-reboot':
+      ensure  => present,
+      command => "cd $base_installation::puppet_code_path ; 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",
+    }
   }
 }