Upgrading for 2.7 compatibility --config

diff --git a/manifests/init.pp b/manifests/init.pp
index 1d3775fd4aaa380f8599a24f6bd09ce46df55794..dd39e37d0a8138c7e521c1638ca23091f7e5b603 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,9 +1,8 @@
-class hotglue {
-  case $apache_www_folder {
-    '': { $apache_www_folder = "/var/www" }
-  }
+class hotglue(
+  $folder = ${apache::www_folder}
+) {
 
-  vcsrepo { "${apache_www_folder}/hotglue2":
+  vcsrepo { "${folder}/hotglue2":
     ensure   => present,
     provider => git,
     source   => 'https://github.com/hotglue/hotglue2.git',
@@ -12,20 +11,20 @@ class hotglue {
     group    => 'root',
   }
 
-  file { "${apache_www_folder}/hotglue2/sites":
+  file { "${folder}/hotglue2/sites":
     ensure  => directory,
     owner   => root,
     group   => root,
     mode    => 0755,
-    require => Vcsrepo["${apache_www_folder}/hotglue2"],
+    require => Vcsrepo["${folder}/hotglue2"],
   }
 
-  file { "${apache_www_folder}/hotglue2/user-config.inc.php":
+  file { "${folder}/hotglue2/user-config.inc.php":
     ensure  => present,
     owner   => root,
     group   => root,
     mode    => 0644,
     source  => "puppet:///modules/hotglue/user-config.inc.php",
-    require => Vcsrepo["${apache_www_folder}/hotglue2"],
+    require => Vcsrepo["${folder}/hotglue2"],
   }
 }