From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 25 Jan 2013 12:39:40 +0000 (-0200)
Subject: Refactoring to use parametrized classes and hiera
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=ea24ef0ab5f15019bf12f4757be35f2f21640fa8;p=puppet-nodo.git

Refactoring to use parametrized classes and hiera
---

diff --git a/manifests/subsystems/websites.pp b/manifests/subsystems/websites.pp
index 634e1c2..6fa764b 100644
--- 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 4329f81..e68e5d6 100644
--- 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":