X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=d86b39c4805b51fb5bb1c8d852b964496e45a80e;hb=84ae359a4dd89da06aa33e2e75d62476d7b6ea82;hp=8f2249d322134ea742bbc6c27c2d00ceb0b69573;hpb=a73e12b43024e21d6361f6a4fa6e691e1c559abe;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 8f2249d32..d86b39c48 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -1,82 +1,85 @@
 class nagios::client inherits nagios {
+  package { 'dsa-nagios-nrpe-config':
+    ensure => purged
+  }
+  package { 'dsa-nagios-checks':
+    ensure => installed,
+    tag    => extra_repo,
+  }
 
-	package { 'dsa-nagios-nrpe-config':
-		ensure => purged
-	}
-	package { 'dsa-nagios-checks':
-		ensure => installed,
-		tag    => extra_repo,
-	}
+  service { 'nagios-nrpe-server':
+    ensure    => running,
+    hasstatus => false,
+    pattern   => 'nrpe',
+  }
 
-	service { 'nagios-nrpe-server':
-		ensure    => running,
-		hasstatus => false,
-		pattern   => 'nrpe',
-	}
+  Ferm::Rule::Simple <<| tag == 'nagios-nrpe::server' |>>
 
-	@ferm::rule { 'dsa-nagios-v4':
-		description => 'Allow nrpe from nagios master',
-		rule        => 'proto tcp mod state state (NEW) dport (5666) @subchain \'nagios\' { saddr ($HOST_NAGIOS_V4) ACCEPT; }',
-		notarule    => true,
-	}
-	@ferm::rule { 'dsa-nagios-v6':
-		description => 'Allow nrpe from nagios master',
-		domain      => 'ip6',
-		rule        => 'proto tcp mod state state (NEW) dport (5666) @subchain \'nagios\' { saddr ($HOST_NAGIOS_V6) ACCEPT; }',
-		notarule    => true,
-	}
+  file { '/etc/default/nagios-nrpe-server':
+    source  => 'puppet:///modules/nagios/common/default',
+    require => Package['nagios-nrpe-server'],
+    notify  => Service['nagios-nrpe-server'],
+  }
+  file { '/etc/default/nagios-nrpe':
+    ensure => absent,
+    notify => Service['nagios-nrpe-server'],
+  }
+  file { '/etc/nagios/':
+    ensure  => directory,
+    recurse => remote,
+    source  => 'puppet:///files/empty/',
+    require => Package['nagios-nrpe-server'],
+    notify  => Service['nagios-nrpe-server'],
+  }
+  file { '/etc/nagios/nrpe.cfg':
+    content => template('nagios/nrpe.cfg.erb'),
+    notify  => Service['nagios-nrpe-server'],
+  }
+  file { '/etc/nagios/nrpe.d':
+    ensure  => directory,
+    recurse => remote,
+    source  => 'puppet:///files/empty/',
+    notify  => Service['nagios-nrpe-server'],
+  }
 
-	file { '/etc/default/nagios-nrpe-server':
-		source  => 'puppet:///modules/nagios/common/default',
-		require => Package['nagios-nrpe-server'],
-		notify  => Service['nagios-nrpe-server'],
-	}
-	file { '/etc/default/nagios-nrpe':
-		ensure  => absent,
-		notify  => Service['nagios-nrpe-server'],
-	}
-	file { '/etc/nagios/':
-		ensure  => directory,
-		recurse => remote,
-		source  => 'puppet:///files/empty/',
-		require => Package['nagios-nrpe-server'],
-		notify  => Service['nagios-nrpe-server'],
-	}
-	file { '/etc/nagios/nrpe.cfg':
-		content => template('nagios/nrpe.cfg.erb'),
-		notify  => Service['nagios-nrpe-server'],
-	}
-	file { '/etc/nagios/nrpe.d':
-		ensure  => directory,
-		recurse => remote,
-		source  => 'puppet:///files/empty/',
-		notify  => Service['nagios-nrpe-server'],
-	}
-	file { '/etc/nagios/nrpe.d/debianorg.cfg':
-		content => template('nagios/inc-debian.org.erb'),
-		notify  => Service['nagios-nrpe-server'],
-	}
-	file { '/etc/nagios/nrpe.d/nrpe_dsa.cfg':
-		source  => 'puppet:///modules/nagios/dsa-nagios/generated/nrpe_dsa.cfg',
-		notify  => Service['nagios-nrpe-server'],
-	}
-	file { '/etc/nagios/obsolete-packages-ignore':
-		source  => 'puppet:///modules/nagios/common/obsolete-packages-ignore',
-		require => Package['dsa-nagios-checks'],
-	}
-	file { '/etc/nagios/check-libs.conf':
-		source  => 'puppet:///modules/nagios/common/check-libs.conf',
-		require => Package['dsa-nagios-checks'],
-	}
-	file { '/etc/nagios/obsolete-packages-ignore.d/hostspecific':
-		content => template('nagios/obsolete-packages-ignore.d-hostspecific.erb'),
-		require => Package['dsa-nagios-checks'],
-	}
-	file { '/usr/local/sbin/dsa-check-libs':
-		ensure => absent,
-	}
+  concat { '/etc/nagios/nrpe.d/debianorg.cfg':
+    ensure_newline => true,
+    warn           => '# This file is maintained with puppet',
+    notify         => Service['nagios-nrpe-server'],
+    mode           => '0444',
+  }
+  concat::fragment { 'nrpe-debian-staticchecks':
+    target  => '/etc/nagios/nrpe.d/debianorg.cfg',
+    content => template('nagios/inc-debian.org.erb'),
+  }
+  Concat::Fragment <<| tag == 'nagios-nrpe::server::debianorg.cfg' |>>
 
-	file { '/etc/cron.d/puppet-nagios-wraps':
-		content  => "47 * * * * root /usr/sbin/dsa-wrap-nagios-check -s puppet-agent /usr/lib/nagios/plugins/dsa-check_puppet_agent -d0 -c 28800 -w 18000\n",
-	}
+  file { '/etc/nagios/nrpe.d/nrpe_dsa.cfg':
+    source => 'puppet:///modules/nagios/dsa-nagios/generated/nrpe_dsa.cfg',
+    notify => Service['nagios-nrpe-server'],
+  }
+  file { '/etc/nagios/obsolete-packages-ignore':
+    source  => 'puppet:///modules/nagios/common/obsolete-packages-ignore',
+    require => Package['dsa-nagios-checks'],
+  }
+  file { '/etc/nagios/check-libs.conf':
+    source  => 'puppet:///modules/nagios/common/check-libs.conf',
+    require => Package['dsa-nagios-checks'],
+  }
+  file { '/etc/nagios/obsolete-packages-ignore.d/hostspecific':
+    content => template('nagios/obsolete-packages-ignore.d-hostspecific.erb'),
+    require => Package['dsa-nagios-checks'],
+  }
+  file { '/usr/local/sbin/dsa-check-libs':
+    ensure => absent,
+  }
+
+  file { '/etc/cron.d/puppet-nagios-wraps': ensure => absent, }
+  concat::fragment { 'puppet-crontab--nagios--dsa-check-puppet-agent':
+    target  => '/etc/cron.d/puppet-crontab',
+    order   => '010',
+    content => @(EOF)
+      47 * * * * root dsa-wrap-nagios-check -s puppet-agent dsa-check-puppet_agent -d0 -c 28800 -w 18000
+      | EOF
+  }
 }