diff options
Diffstat (limited to 'manifests/base.pp')
-rw-r--r-- | manifests/base.pp | 76 |
1 files changed, 34 insertions, 42 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index fa28c41..4922cdb 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,7 +1,7 @@ # basic stuff for nagios class nagios::base { # include the variables - include nagios::defaults::vars + include ::nagios::defaults::vars package { 'nagios': ensure => present, @@ -10,7 +10,6 @@ class nagios::base { service { 'nagios': ensure => running, enable => $nagios::service_at_boot, - #hasstatus => true, #fixme! require => Package['nagios'], } @@ -24,17 +23,18 @@ class nagios::base { recurse => true, purge => true, force => true, + require => Package['nagios'], notify => Service['nagios'], owner => root, group => root, mode => '0755'; 'nagios_main_cfg': path => "${cfg_dir}/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' ], + 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'], owner => root, group => root, @@ -42,34 +42,25 @@ class nagios::base { 'nagios_cgi_cfg': path => "${cfg_dir}/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' ], + "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' ], notify => Service['apache'], owner => 'root', group => 0, mode => '0644'; 'nagios_htpasswd': path => "${cfg_dir}/htpasswd.users", - source => ['puppet:///modules/site_nagios/htpasswd.users', - 'puppet:///modules/nagios/htpasswd.users' ], + source => [ 'puppet:///modules/site_nagios/htpasswd.users', + 'puppet:///modules/nagios/htpasswd.users' ], owner => root, group => apache, mode => '0640'; - 'nagios_private': - ensure => directory, - path => "${cfg_dir}/private", - purge => true, - recurse => true, - notify => Service['nagios'], - owner => root, - group => nagios, - mode => '0750'; - 'nagios_private_resource_cfg': - path => "${cfg_dir}/private/resource.cfg", + 'nagios_resource_cfg': + path => "${cfg_dir}/resource.cfg", source => [ "puppet:///modules/site_nagios/configs/${::operatingsystem}/private/resource.cfg.${::architecture}", - "puppet:///modules/nagios/configs/${::operatingsystem}/private/resource.cfg.${::architecture}" ], + "puppet:///modules/nagios/configs/${::operatingsystem}/private/resource.cfg.${::architecture}" ], notify => Service['nagios'], owner => root, group => nagios, @@ -78,8 +69,9 @@ class nagios::base { if $cfg_dir == '/etc/nagios3' { file{'/etc/nagios': - ensure => link, - target => $cfg_dir, + ensure => link, + target => $cfg_dir, + require => Package['nagios'], } } @@ -142,21 +134,21 @@ class nagios::base { } file{ - ["${cfg_dir}/nagios_command.cfg", - "${cfg_dir}/nagios_contact.cfg", - "${cfg_dir}/nagios_contactgroup.cfg", - "${cfg_dir}/nagios_host.cfg", - "${cfg_dir}/nagios_hostdependency.cfg", - "${cfg_dir}/nagios_hostescalation.cfg", - "${cfg_dir}/nagios_hostextinfo.cfg", - "${cfg_dir}/nagios_hostgroup.cfg", - "${cfg_dir}/nagios_hostgroupescalation.cfg", - "${cfg_dir}/nagios_service.cfg", - "${cfg_dir}/nagios_servicedependency.cfg", - "${cfg_dir}/nagios_serviceescalation.cfg", - "${cfg_dir}/nagios_serviceextinfo.cfg", - "${cfg_dir}/nagios_servicegroup.cfg", - "${cfg_dir}/nagios_timeperiod.cfg" ]: + [ "${cfg_dir}/nagios_command.cfg", + "${cfg_dir}/nagios_contact.cfg", + "${cfg_dir}/nagios_contactgroup.cfg", + "${cfg_dir}/nagios_host.cfg", + "${cfg_dir}/nagios_hostdependency.cfg", + "${cfg_dir}/nagios_hostescalation.cfg", + "${cfg_dir}/nagios_hostextinfo.cfg", + "${cfg_dir}/nagios_hostgroup.cfg", + "${cfg_dir}/nagios_hostgroupescalation.cfg", + "${cfg_dir}/nagios_service.cfg", + "${cfg_dir}/nagios_servicedependency.cfg", + "${cfg_dir}/nagios_serviceescalation.cfg", + "${cfg_dir}/nagios_serviceextinfo.cfg", + "${cfg_dir}/nagios_servicegroup.cfg", + "${cfg_dir}/nagios_timeperiod.cfg" ]: ensure => file, replace => false, notify => Service['nagios'], |