diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-24 23:18:56 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-24 23:18:56 -0200 |
| commit | 2a4d6f13165a9e8777fa424b42d7883525a50bd1 (patch) | |
| tree | 1e38f9cf0edd46ae3da1820dca47faffc216dd22 /manifests | |
| parent | 15973911ef2fe2b9bd836396bfd0b5ce6e109f7a (diff) | |
| download | puppet-nodo-2a4d6f13165a9e8777fa424b42d7883525a50bd1.tar.gz puppet-nodo-2a4d6f13165a9e8777fa424b42d7883525a50bd1.tar.bz2 | |
Getting git daemon config from hiera
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/subsystems/websites.pp | 2 | ||||
| -rw-r--r-- | manifests/web.pp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/manifests/subsystems/websites.pp b/manifests/subsystems/websites.pp index 93415d3..634e1c2 100644 --- 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 95528d5..4329f81 100644 --- 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 } |