Hiera, drush make cron and makefiles fixes

1 files changed, 29 insertions, 3 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 7f74cb8..d832b81 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,7 +1,7 @@
 class drupal(
-  $folder = '/var/www/data/drupal',
-  $sites_folder = '/var/sites',
-  $www_folder = '/var/www/data'
+  $folder       = hiera('drupal::folder,       '/var/www/data/drupal'),
+  $sites_folder = hiera('drupal::sites_folder, '/var/sites'),
+  $www_folder   = hiera('drupal::www_folder',  '/var/www/data')
 ) {
   # We use drupal source from upstream 
   package { "drupal6":
@@ -61,6 +61,32 @@ class drupal(
     ensure   => present,
   }
 
+  cron { "drupal-make-6":
+    command  => "/usr/local/sbin/drupal make 6",
+    user     => root,
+    # Run once a week to ensure the server has all dependencies
+    weekday  => 4,
+    hour     => "02",
+    minute   => "30",
+    ensure   => present,
+    require  => File['/usr/local/sbin/drupal',
+                     '/usr/local/share/drupal/drupal6.make',
+                     '/usr/local/share/drupal/themes6.make'],
+  }
+
+  cron { "drupal-make-7":
+    command  => "/usr/local/sbin/drupal make 7",
+    user     => root,
+    # Run once a week to ensure the server has all dependencies
+    weekday  => 4,
+    hour     => "02",
+    minute   => "30",
+    ensure   => present,
+    require  => File['/usr/local/sbin/drupal',
+                     '/usr/local/share/drupal/drupal7.make',
+                     '/usr/local/share/drupal/themes7.make'],
+  }
+
   # Drupal shared folder
   file { "/usr/local/share/drupal":
     ensure  => directory,