summaryrefslogtreecommitdiff
path: root/puppet/manifests/site.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-01-28 16:54:22 +0100
committervarac <varacanero@zeromail.org>2013-01-28 16:54:22 +0100
commitb9dc3194a6023c65cc78988dfc4cf546ba658eac (patch)
treea4675bfdc96dc48caf86b8bae80c3d8c7b4eb630 /puppet/manifests/site.pp
parent00252d3e425bb385135faf6bda4c462bcce75e59 (diff)
parentf34cecba90941f3e4acbe88cab6ce0b5a76b8ce2 (diff)
Merge branch 'feature/monitoring' into develop
Diffstat (limited to 'puppet/manifests/site.pp')
-rw-r--r--puppet/manifests/site.pp13
1 files changed, 11 insertions, 2 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index a1917d6e..1a76e3bd 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -6,8 +6,13 @@ node 'default' {
import 'common'
include concat::setup
- # include some basic classes
- include site_config
+ $development = hiera('development')
+ if $development['site_config'] == true {
+ # include some basic classes
+ include site_config
+ } else {
+ notice ('NOT applying site_config')
+ }
# parse services for host
$services=hiera_array('services')
@@ -29,4 +34,8 @@ node 'default' {
if 'ca' in $services {
include site_ca_daemon
}
+
+ if 'monitor' in $services {
+ include site_nagios::server
+ }
}