aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/drupal6.make4
-rw-r--r--files/drupal7.make10
-rw-r--r--manifests/init.pp32
3 files changed, 36 insertions, 10 deletions
diff --git a/files/drupal6.make b/files/drupal6.make
index cf7d6bd..ba94096 100644
--- a/files/drupal6.make
+++ b/files/drupal6.make
@@ -47,7 +47,7 @@ projects[] = notify
projects[] = petition_node
projects[] = swftools
projects[] = taxonomy_menu
-projects[] = tribune
+;projects[] = tribune
projects[] = admin_menu
projects[] = captcha
projects[] = contemplate
@@ -147,7 +147,7 @@ projects[] = views_charts
projects[] = views_customfield
projects[] = views_daterange
projects[] = views_groupby
-projects[] = views_slideshow
+;projects[] = views_slideshow
projects[] = l10n_update
projects[] = webform
projects[] = webform_report
diff --git a/files/drupal7.make b/files/drupal7.make
index 60adf8b..db978b2 100644
--- a/files/drupal7.make
+++ b/files/drupal7.make
@@ -69,11 +69,10 @@ projects[] = pathologic
projects[] = subpathauto
; other
-projects[captcha][version] = 1.0-beta2
-projects[signup][version] = 1.x-dev
-projects[subscriptions][version] = 1.0-beta3
-projects[web_widgets][version] = 1.x-dev
-projects[timeline][version] = 3.x-dev
+projects[] = captcha
+projects[] = signup
+projects[] = subscriptions
+projects[] = web_widgets
projects[] = logintoboggan
projects[] = wysiwyg
projects[] = calendar
@@ -121,3 +120,4 @@ projects[] = media
projects[] = panels
projects[] = css_injector
projects[] = spamicide
+;projects[] = timeline
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,