diff options
author | Johan Lundberg <lundberg@nordu.net> | 2015-04-23 15:27:36 +0200 |
---|---|---|
committer | Johan Lundberg <lundberg@nordu.net> | 2015-04-23 15:27:36 +0200 |
commit | 87f3dd641ef54be88f77655b0f4b70557d397fcd (patch) | |
tree | 96baf238811294efcdcbbb1a630d9b414b4d989f /global/overlay/etc/puppet/modules/sunet/manifests | |
parent | e9f06d2ec17be72874fa30f310f8f41bbd695530 (diff) | |
parent | 0008d057cde159d7039c5f93fe69d5b9f7ee6bfb (diff) |
Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-04-23-v01
Diffstat (limited to 'global/overlay/etc/puppet/modules/sunet/manifests')
-rw-r--r-- | global/overlay/etc/puppet/modules/sunet/manifests/nagios.pp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/nagios.pp b/global/overlay/etc/puppet/modules/sunet/manifests/nagios.pp index c09679d..91ccf6c 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/nagios.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/nagios.pp @@ -6,12 +6,12 @@ class sunet::nagios { package {'nagios-nrpe-server': ensure => 'installed', - } -> + } service {'nagios-nrpe-server': ensure => 'running', enable => 'true', require => Package['nagios-nrpe-server'], - } -> + } file { "/etc/nagios/nrpe.cfg" : notify => Service['nagios-nrpe-server'], ensure => 'file', @@ -19,20 +19,27 @@ class sunet::nagios { group => 'nagios', require => Package['nagios-nrpe-server'], content => template('sunet/nagioshost/nrpe.cfg.erb'), - } -> + } file { "/usr/lib/nagios/plugins/check_uptime.pl" : ensure => 'file', mode => '0751', group => 'nagios', require => Package['nagios-nrpe-server'], content => template('sunet/nagioshost/check_uptime.pl.erb'), - } -> + } + file { "/usr/lib/nagios/plugins/check_reboot" : + ensure => 'file', + mode => '0751', + group => 'nagios', + require => Package['nagios-nrpe-server'], + content => template('sunet/nagioshost/check_reboot.erb'), + } ufw::allow { "allow-nrpe-v4": from => "${nagios_ip_v4}", ip => 'any', proto => 'tcp', port => 5666 - } -> + } ufw::allow { "allow-nrpe-v6": from => "${nagios_ip_v6}", ip => 'any', |