diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/apache.pp | 21 | ||||
| -rw-r--r-- | manifests/debian.pp | 6 | ||||
| -rw-r--r-- | manifests/nrpe/debian.pp | 6 | ||||
| -rw-r--r-- | manifests/pnp4nagios/popup.pp | 27 | ||||
| -rw-r--r-- | manifests/service/mysql.pp | 2 | ||||
| -rw-r--r-- | manifests/stored_config.pp | 19 |
6 files changed, 66 insertions, 15 deletions
diff --git a/manifests/apache.pp b/manifests/apache.pp index 8da9c11..8fa9061 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -2,12 +2,31 @@ class nagios::apache( $allow_external_cmd = false, $manage_shorewall = false, - $manage_munin = false + $manage_munin = false, + $stored_config = true ) { class{'::nagios': httpd => 'apache', allow_external_cmd => $allow_external_cmd, manage_munin => $manage_munin, manage_shorewall => $manage_shorewall, + stored_config => $stored_config + } + + case $::operatingsystem { + 'debian': { + file { "${nagios::defaults::vars::int_cfgdir}/apache2.conf": + ensure => present, + source => [ "puppet:///modules/site_nagios/configs/${::fqdn}/apache2.conf", + "puppet:///modules/site_nagios/configs/apache2.conf", + "puppet:///modules/nagios/configs/apache2.conf"], + } + + apache::config::global { "nagios3.conf": + ensure => link, + target => "${nagios::defaults::vars::int_cfgdir}/apache2.conf", + require => File["${nagios::defaults::vars::int_cfgdir}/apache2.conf"], + } + } } } diff --git a/manifests/debian.pp b/manifests/debian.pp index 9b1f7e7..b5d6974 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -21,11 +21,13 @@ class nagios::debian inherits nagios::base { notify => Service['nagios'], owner => root, group => root, - mode => '0644'; + mode => '0644', + require => Package['nagios']; "${nagios::defaults::vars::int_cfgdir}/stylesheets": ensure => directory, purge => false, - recurse => true; + recurse => true, + require => Package['nagios']; } if $nagios::allow_external_cmd { diff --git a/manifests/nrpe/debian.pp b/manifests/nrpe/debian.pp new file mode 100644 index 0000000..fcaf851 --- /dev/null +++ b/manifests/nrpe/debian.pp @@ -0,0 +1,6 @@ +class nagios::nrpe::debian inherits nagios::nrpe::base { + include nagios::nrpe::linux + Service['nagios-nrpe-server'] { + hasstatus => false, + } +} diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index 0dc04b0..91136cc 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,19 +1,24 @@ -class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { +class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { File['pnp4nagios-templates.cfg']{ - source => [ 'puppet:///modules/site_nagios/pnp4nagios/pnp4nagios-popup-templates.cfg', - 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg' ], + source => [ + 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg', + 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg' ], } file { '/usr/share/nagios3/htdocs/ssi': - ensure => directory } + ensure => directory, + require => Package['nagios'], + } file { 'status-header.ssi': - path => '/usr/share/nagios3/htdocs/ssi/status-header.ssi', - source => [ 'puppet:///modules/site_nagios/pnp4nagios/status-header.ssi', - 'puppet:///modules/nagios/pnp4nagios/status-header.ssi' ], - mode => '0644', - owner => root, - group => root, - notify => Service['nagios'], + path => '/usr/share/nagios3/htdocs/ssi/status-header.ssi', + source => [ + 'puppet:///modules/site-nagios/pnp4nagios/status-header.ssi', + 'puppet:///modules/nagios/pnp4nagios/status-header.ssi'], + mode => '0644', + owner => root, + group => root, + notify => Service['nagios'], + require => Package['nagios'], } } diff --git a/manifests/service/mysql.pp b/manifests/service/mysql.pp index 2c74717..9559b17 100644 --- a/manifests/service/mysql.pp +++ b/manifests/service/mysql.pp @@ -27,7 +27,7 @@ define nagios::service::mysql( if $check_warning != undef { $real_check_warning = "!--warning $check_warning" } - + if $check_critical != undef { $real_check_critical = "!--critical $check_critical" } diff --git a/manifests/stored_config.pp b/manifests/stored_config.pp new file mode 100644 index 0000000..5afda04 --- /dev/null +++ b/manifests/stored_config.pp @@ -0,0 +1,19 @@ +class nagios::stored_config { + # collect exported resources + + Nagios_command <<||>> + Nagios_contactgroup <<||>> + Nagios_contact <<||>> + Nagios_hostdependency <<||>> + Nagios_hostescalation <<||>> + Nagios_hostextinfo <<||>> + Nagios_hostgroup <<||>> + Nagios_host <<||>> + Nagios_servicedependency <<||>> + Nagios_serviceescalation <<||>> + Nagios_servicegroup <<||>> + Nagios_serviceextinfo <<||>> + Nagios_service <<||>> + Nagios_timeperiod <<||>> + +} |