Upgrading for 2.7 compatibility --config

diff --git a/manifests/init.pp b/manifests/init.pp
index d0a6e6bf99f3d2bc79ac90351b1a39c53d82e656..7a9f4c57b18468926e2936cfb162adf644b3b531 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,12 +1,9 @@
-class drupal inherits pear {
-
-  case $apache_www_folder {
-    '': { fail("you need to define \$apache_www_folder for drupal module") }
-  }
-
-  case $apache_sites_folder {
-    '': { fail("you need to define \$apache_sites_folder for drupal module") }
-  }
+class drupal(
+  $folder = "${apache::www_folder}/drupal"
+  $sites_folder = "${apache::sites_folder}"
+  $www_folder = "${apache::sites_www_folder}"
+) {
+  include pear
 
   # We use drupal source from upstream 
   package { "drupal6":

diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb
index 112426882abd5a634f91d1698b992e4496e6798e..d10658ac3b3490a2d0aa0789676eaf50df3971d1 100644 (file)
--- a/templates/drupal.sh.erb
+++ b/templates/drupal.sh.erb
@@ -3,8 +3,8 @@
 # Drupal management script.
 #
 
-SITES="<%= apache_sites_folder %>"
-BASE="<%= apache_www_folder %>"
+SITES="<%= scope.lookupvar('drupal::sites_folder') %>"
+BASE="<%= scope.lookupvar('drupal::www_folder') %>"
 SERIES="5 6 7"
 
 # Read a parameter from user