Refactoring to use parametrized classes and hiera

diff --git a/manifests/subsystems/websites.pp b/manifests/subsystems/websites.pp
index 634e1c26d464ada80e484cfada1971397ddb3ab2..6fa764ba01a46b56cfffcd42e694b93ed35eb68b 100644 (file)
--- a/manifests/subsystems/websites.pp
+++ b/manifests/subsystems/websites.pp
@@ -110,7 +110,7 @@ class websites::hosting inherits websites::setup {
   $git_daemon = hiera('nodo::web::git_daemon', True)
 
   if $git_daemon != false {
-    include gitweb
+    class { 'gitweb': }
   }
 
   apache::site { "images":

diff --git a/manifests/web.pp b/manifests/web.pp
index 4329f811b9ef0c5701f260d457c231d23dbc70c6..e68e5d65bd061f9369f6fdb7890ef6c7b3edb13c 100644 (file)
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -21,7 +21,7 @@ class nodo::web inherits nodo::vserver {
   $git_daemon = hiera('nodo::web::git_daemon', True)
 
   if $git_daemon != false {
-    include git-daemon
+    class { 'git::daemon': }
   }
 
   backupninja::svn { "svn":