Merge tag '0.8.0'

Release 0.8.0

5 files changed, 29 insertions, 22 deletions

diff --git a/puppet/modules/site_nagios/manifests/server/add_contacts.pp b/puppet/modules/site_nagios/manifests/server/add_contacts.pp
index db507abf..b5c6f0a5 100644
--- a/puppet/modules/site_nagios/manifests/server/add_contacts.pp
+++ b/puppet/modules/site_nagios/manifests/server/add_contacts.pp
@@ -1,3 +1,4 @@
+# configure a nagios_contact
 define site_nagios::server::add_contacts ($contact_emails) {
 
   $environment = $name
@@ -11,6 +12,7 @@ define site_nagios::server::add_contacts ($contact_emails) {
       host_notification_options     => 'd,r',
       service_notification_commands => 'notify-service-by-email',
       host_notification_commands    => 'notify-host-by-email',
-      email                         => join($contact_emails, ', ')
+      email                         => join($contact_emails, ', '),
+      require                       => Package['nagios']
   }
 }
diff --git a/puppet/modules/site_nagios/manifests/server/apache.pp b/puppet/modules/site_nagios/manifests/server/apache.pp
index 8dbc7e9b..82962e89 100644
--- a/puppet/modules/site_nagios/manifests/server/apache.pp
+++ b/puppet/modules/site_nagios/manifests/server/apache.pp
@@ -1,7 +1,25 @@
+# set up apache for nagios
 class site_nagios::server::apache {
+
   include x509::variables
+
   include site_config::x509::commercial::cert
   include site_config::x509::commercial::key
   include site_config::x509::commercial::ca
 
+  include apache::module::authn_file
+  # "AuthUserFile"
+  include apache::module::authz_user
+  # "AuthType Basic"
+  include apache::module::auth_basic
+  # "DirectoryIndex"
+  include apache::module::dir
+  include apache::module::php5
+  include apache::module::cgi
+
+  # apache >= 2.4, debian jessie
+  if ( $::lsbdistcodename == 'jessie' ) {
+    include apache::module::authn_core
+  }
+
 }
diff --git a/puppet/modules/site_nagios/manifests/server/contactgroup.pp b/puppet/modules/site_nagios/manifests/server/contactgroup.pp
index 188c54f1..5e60dd06 100644
--- a/puppet/modules/site_nagios/manifests/server/contactgroup.pp
+++ b/puppet/modules/site_nagios/manifests/server/contactgroup.pp
@@ -1,6 +1,8 @@
+# configure a contactgroup
 define site_nagios::server::contactgroup ($contact_emails) {
 
   nagios_contactgroup { $name:
-    members => $name
+    members => $name,
+    require => Package['nagios']
   }
 }
diff --git a/puppet/modules/site_nagios/manifests/server/hostgroup.pp b/puppet/modules/site_nagios/manifests/server/hostgroup.pp
index 6f85ca6d..0692fced 100644
--- a/puppet/modules/site_nagios/manifests/server/hostgroup.pp
+++ b/puppet/modules/site_nagios/manifests/server/hostgroup.pp
@@ -1,3 +1,7 @@
+# create a nagios hostsgroup
 define site_nagios::server::hostgroup ($contact_emails) {
-  nagios_hostgroup { $name: }
+  nagios_hostgroup { $name:
+    ensure  => present,
+    require => Package['nagios']
+  }
 }
diff --git a/puppet/modules/site_nagios/manifests/server/purge.pp b/puppet/modules/site_nagios/manifests/server/purge.pp
deleted file mode 100644
index 6815a703..00000000
--- a/puppet/modules/site_nagios/manifests/server/purge.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-class site_nagios::server::purge inherits nagios::base {
-  # we don't want to get /etc/nagios3 and /etc/nagios3/conf.d
-  # purged, cause the check-mk-config-nagios3 package
-  # places its templates in /etc/nagios3/conf.d/check_mk,
-  # and check_mk -O updated it's nagios config in /etc/nagios3/conf.d/check_mk
-  File['nagios_cfgdir'] {
-    purge => false
-  }
-  File['nagios_confd'] {
-    purge => false
-  }
-
-  # only purge files in the /etc/nagios3/conf.d/ dir, not in any subdir
-  exec {'purge_conf.d':
-    command => '/usr/bin/find /etc/nagios3/conf.d/ -maxdepth 1 -type f -exec rm {} \;',
-    onlyif  => '/usr/bin/find /etc/nagios3/conf.d/ -maxdepth 1 -type f | grep -q "/etc/nagios3/conf.d"',
-    require => Package['nagios']
-  }
-}