Getting git daemon config from hiera

diff --git a/manifests/subsystems/websites.pp b/manifests/subsystems/websites.pp
index 93415d309ad6984d423712d16270e4f312729316..634e1c26d464ada80e484cfada1971397ddb3ab2 100644 (file)
--- a/manifests/subsystems/websites.pp
+++ b/manifests/subsystems/websites.pp
@@ -107,6 +107,8 @@ class websites::hosting inherits websites::setup {
       root_parents => "/var/svn : svn";
   }
 
+  $git_daemon = hiera('nodo::web::git_daemon', True)
+
   if $git_daemon != false {
     include gitweb
   }

diff --git a/manifests/web.pp b/manifests/web.pp
index 95528d5298290ebfe44be2665f6fa881fd76117e..4329f811b9ef0c5701f260d457c231d23dbc70c6 100644 (file)
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -6,7 +6,7 @@ class nodo::web inherits nodo::vserver {
   include utils::web
 
   # Reprepro configuration
-  $reprepro = hiera('nodo::web::reprepro', false)
+  $reprepro         = hiera('nodo::web::reprepro', false)
   $reprepro_basedir = '/var/reprepro'
 
   case $reprepro {
@@ -18,6 +18,8 @@ class nodo::web inherits nodo::vserver {
     }
   }
 
+  $git_daemon = hiera('nodo::web::git_daemon', True)
+
   if $git_daemon != false {
     include git-daemon
   }