Merge branch 'feature/monitoring' into develop

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
+  }
 }