Upgrading for 2.7 compatibility --config

diff --git a/manifests/init.pp b/manifests/init.pp
index aa245935eb13d5d183bb1ef4c62c245d461414bc..a433910cc4833d0d58c12a273550ef1065095495 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,15 +1,9 @@
-class wordpress {
+class wordpress(
+  $folder = ${apache::www_folder},
+  $locale = ''
+) {
 
-  case $wordpress_folder {
-    '' : {
-      case $apache_www_folder {
-        '':      { fail("you need to define \$apache_www_folder for wordpress module") }
-        default: { $wordpress_folder = $apache_www_folder }
-      }
-    }
-  }
-
-  $real_wordpress_locale = $wordpress_locale ? {
+  $real_wordpress_locale = $locale ? {
     ''      => '',
     default => "-${wordpress_locale}"
   } 

diff --git a/templates/wordpress.sh.erb b/templates/wordpress.sh.erb
index 41d739fc4e49fff418265bffd5d5e11b293dd1ca..826dc82a9aae48f9d2422ce8646e8e2a8733e6c9 100644 (file)
--- a/templates/wordpress.sh.erb
+++ b/templates/wordpress.sh.erb
@@ -3,7 +3,7 @@
 # wordpress management script.
 #
 
-BASE="<%= wordpress_folder %>"
+BASE="<%= folder %>"
 LOCALE="<%= real_wordpress_locale %>"
 
 # Set alternative base