Merge branch 'merge_immerda'

Conflicts:
	manifests/apache.pp

this conflict was just a indentation difference.

1 files changed, 49 insertions, 60 deletions

diff --git a/manifests/base.pp b/manifests/base.pp
index 589e98b..d4d6590 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -4,7 +4,7 @@ class nagios::base {
 
     package { 'nagios':
         alias => 'nagios',
-        ensure => present,   
+        ensure => present,
     }
 
     service { 'nagios':
@@ -16,15 +16,15 @@ class nagios::base {
 
     # this file should contain all the nagios_puppet-paths:
     file { 'nagios_main_cfg':
-            path => "${nagios::defaults::vars::int_nagios_cfgdir}/nagios.cfg",
-            source => [ "puppet:///modules/site-nagios/configs/${fqdn}/nagios.cfg",
-                        "puppet:///modules/site-nagios/configs/${operatingsystem}/nagios.cfg",
-                        "puppet:///modules/site-nagios/configs/nagios.cfg",
-                        "puppet:///modules/nagios/configs/${operatingsystem}/nagios.cfg",
+            path => "${nagios::defaults::vars::int_cfgdir}/nagios.cfg",
+            source => [ "puppet:///modules/site_nagios/configs/${::fqdn}/nagios.cfg",
+                        "puppet:///modules/site_nagios/configs/${::operatingsystem}/nagios.cfg",
+                        "puppet:///modules/site_nagios/configs/nagios.cfg",
+                        "puppet:///modules/nagios/configs/${::operatingsystem}/nagios.cfg",
                         "puppet:///modules/nagios/configs/nagios.cfg" ],
             notify => Service['nagios'],
             mode => 0644, owner => root, group => root;
-    }    
+    }
 
     file { 'nagios_commands_cfg':
             path   => "${nagios::defaults::vars::int_nagios_cfgdir}/commands.cfg",
@@ -34,26 +34,25 @@ class nagios::base {
     }
 
     file { 'nagios_cgi_cfg':
-        path => "${nagios::defaults::vars::int_nagios_cfgdir}/cgi.cfg",
-        source => [ "puppet:///modules/site-nagios/configs/${fqdn}/cgi.cfg",
-                    "puppet:///modules/site-nagios/configs/${operatingsystem}/cgi.cfg",
-                    "puppet:///modules/site-nagios/configs/cgi.cfg",
-                    "puppet:///modules/nagios/configs/${operatingsystem}/cgi.cfg",
+        path => "${nagios::defaults::vars::int_cfgdir}/cgi.cfg",
+        source => [ "puppet:///modules/site_nagios/configs/${::fqdn}/cgi.cfg",
+                    "puppet:///modules/site_nagios/configs/${::operatingsystem}/cgi.cfg",
+                    "puppet:///modules/site_nagios/configs/cgi.cfg",
+                    "puppet:///modules/nagios/configs/${::operatingsystem}/cgi.cfg",
                     "puppet:///modules/nagios/configs/cgi.cfg" ],
         mode => '0644', owner => 'root', group => 0,
         notify => Service['apache'],
     }
 
     file { 'nagios_htpasswd':
-        path => "${nagios::defaults::vars::int_nagios_cfgdir}/htpasswd.users",
-        source => [ "puppet:///modules/site-nagios/htpasswd.users",
+        path => "${nagios::defaults::vars::int_cfgdir}/htpasswd.users",
+        source => [ "puppet:///modules/site_nagios/htpasswd.users",
                     "puppet:///modules/nagios/htpasswd.users" ],
         mode => 0640, owner => root, group => apache;
     }
 
     file { 'nagios_private':
-        path => "${nagios::defaults::vars::int_nagios_cfgdir}/private/",
-        source => "puppet:///modules/common/empty",
+        path => "${nagios::defaults::vars::int_cfgdir}/private/",
         ensure => directory,
         purge => true,
         recurse => true,
@@ -62,24 +61,21 @@ class nagios::base {
     }
 
     file { 'nagios_private_resource_cfg':
-        path => "${nagios::defaults::vars::int_nagios_cfgdir}/private/resource.cfg",
-        source => [ "puppet:///modules/site-nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}",
-                    "puppet:///modules/nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}" ],
+        path => "${nagios::defaults::vars::int_cfgdir}/private/resource.cfg",
+        source => [ "puppet:///modules/site_nagios/configs/${::operatingsystem}/private/resource.cfg.${::architecture}",
+                    "puppet:///modules/nagios/configs/${::operatingsystem}/private/resource.cfg.${::architecture}" ],
         notify => Service['nagios'],
         owner => root, group => nagios, mode => '0640';
     }
 
     file { 'nagios_confd':
-        path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/",
-        source => "puppet:///modules/common/empty",
+        path => "${nagios::defaults::vars::int_cfgdir}/conf.d/",
         ensure => directory,
         purge => true,
         recurse => true,
         notify => Service['nagios'],
         mode => '0750', owner => root, group => nagios;
     }
-    Package <<| tag == 'nagios::plugin::deploy::package' |>>
-    File <<| tag == 'nagios::plugin::deploy::file' |>>
     Nagios_command <<||>>
     Nagios_contactgroup <<||>>
     Nagios_contact <<||>>
@@ -94,91 +90,90 @@ class nagios::base {
     Nagios_serviceextinfo <<||>>
     Nagios_service <<||>>
     Nagios_timeperiod <<||>>
-    File <<| tag == 'nagios_plugin' |>>
 
     Nagios_command <||> {
-        target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_command.cfg",
+        target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_command.cfg",
         require => File['nagios_confd'],
         notify => Service['nagios'],
     }
     Nagios_contact <||> {
-        target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_contact.cfg",
+        target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_contact.cfg",
         require => File['nagios_confd'],
         notify => Service['nagios'],
     }
     Nagios_contactgroup <||> {
-        target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_contactgroup.cfg",
+        target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_contactgroup.cfg",
         require => File['nagios_confd'],
         notify => Service['nagios'],
     }
     Nagios_host <||> {
-        target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_host.cfg",
+        target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_host.cfg",
         require => File['nagios_confd'],
         notify => Service['nagios'],
     }
     Nagios_hostdependency <||> {
-        target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostdependency.cfg",
+        target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostdependency.cfg",
         notify => Service['nagios'],
     }
     Nagios_hostescalation <||> {
-        target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostescalation.cfg",
+        target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostescalation.cfg",
         notify => Service['nagios'],
     }
     Nagios_hostextinfo <||> {
-        target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostextinfo.cfg",
+        target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostextinfo.cfg",
         require => File['nagios_confd'],
         notify => Service['nagios'],
     }
     Nagios_hostgroup <||> {
-        target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostgroup.cfg",
+        target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostgroup.cfg",
         require => File['nagios_confd'],
         notify => Service['nagios'],
     }
     Nagios_service <||> {
-        target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_service.cfg",
+        target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_service.cfg",
         require => File['nagios_confd'],
         notify => Service['nagios'],
     }
     Nagios_servicegroup <||> {
-        target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_servicegroup.cfg",
+        target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_servicegroup.cfg",
         notify => Service['nagios'],
     }
     Nagios_servicedependency <||> {
-        target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_servicedependency.cfg",
+        target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_servicedependency.cfg",
         require => File['nagios_confd'],
         notify => Service['nagios'],
     }
     Nagios_serviceescalation <||> {
-        target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_serviceescalation.cfg",
+        target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_serviceescalation.cfg",
         require => File['nagios_confd'],
         notify => Service['nagios'],
     }
     Nagios_serviceextinfo <||> {
-        target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_serviceextinfo.cfg",
+        target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_serviceextinfo.cfg",
         require => File['nagios_confd'],
         notify => Service['nagios'],
     }
     Nagios_timeperiod <||> {
-        target => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_timeperiod.cfg",
+        target => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_timeperiod.cfg",
         require => File['nagios_confd'],
         notify => Service['nagios'],
     }
 
-    file{[ "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_command.cfg", 
-           "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_contact.cfg", 
-           "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_contactgroup.cfg",
-           "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_host.cfg",
-           "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostdependency.cfg",
-           "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostescalation.cfg",
-           "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostextinfo.cfg",
-           "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostgroup.cfg",
-           "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_hostgroupescalation.cfg",
-           "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_service.cfg",
-           "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_servicedependency.cfg",
-           "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_serviceescalation.cfg",
-           "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_serviceextinfo.cfg",
-           "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_servicegroup.cfg",
-           "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_timeperiod.cfg" ]:
+    file{[ "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_command.cfg",
+           "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_contact.cfg",
+           "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_contactgroup.cfg",
+           "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_host.cfg",
+           "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostdependency.cfg",
+           "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostescalation.cfg",
+           "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostextinfo.cfg",
+           "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostgroup.cfg",
+           "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_hostgroupescalation.cfg",
+           "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_service.cfg",
+           "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_servicedependency.cfg",
+           "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_serviceescalation.cfg",
+           "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_serviceextinfo.cfg",
+           "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_servicegroup.cfg",
+           "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_timeperiod.cfg" ]:
         ensure => file,
         replace => false,
         notify => Service['nagios'],
@@ -188,17 +183,11 @@ class nagios::base {
     # manage nagios cfg files
     # must be defined after exported resource overrides and cfg file defs
     file { 'nagios_cfgdir':
-        path => "${nagios::defaults::vars::int_nagios_cfgdir}/",
-        source => "puppet:///modules/common/empty",
+        path => "${nagios::defaults::vars::int_cfgdir}/",
         ensure => directory,
         recurse => true,
         purge => true,
         notify => Service['nagios'],
         mode => 0755, owner => root, group => root;
     }
-
-    if $use_munin {
-        include nagios::munin
-    }
-
 }