Upgrading for 2.7 compatibility --config

diff --git a/manifests/init.pp b/manifests/init.pp
index eec5e96799dac41dbba8e6c55e10783fb8c64cda..a402e9e40780e9c6f9e2373598c736b0434447dc 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,8 +1,6 @@
-class pmwiki {
-
-  case $apache_www_folder {
-    '': { fail("you need to define \$apache_www_folder for pmwiki module") }
-  }
+class pmwiki(
+  $www_folder = ${apache_www_folder}
+) {
 
   file { "/usr/local/sbin/pmwiki":
     ensure  => present,

diff --git a/templates/pmwiki.sh.erb b/templates/pmwiki.sh.erb
index 4b1e9dc2c081198c38c42fc441559fea46cb4bf3..204916eade4c5de068863f9bf83fca84de8cfa22 100644 (file)
--- a/templates/pmwiki.sh.erb
+++ b/templates/pmwiki.sh.erb
@@ -3,7 +3,7 @@
 # pmwiki management script.
 #
 
-BASE="<%= apache_www_folder %>"
+BASE="<%= scope.lookupvar('pmwiki::www_folder') %>"
 
 # Check for existing installations
 function pmwiki_check_existing {