X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=dd39e5f5e3b3971a8a564f29a6717a8efe15ee6d;hb=940b26bfd05d0768b4ceee585eb478824dfb471b;hp=9cea3378a4fec2f3abd6a5cc1fb167c832bb7ed2;hpb=78ceca7ca6540a83d24a89016263235c923543db;p=dsa-puppet.git

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 9cea3378..dd39e5f5 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -1,52 +1,79 @@
 class nagios::client inherits nagios {
-	package {
-		dsa-nagios-nrpe-config: ensure => purged;
-		dsa-nagios-checks: ensure => installed;
+
+	package { 'dsa-nagios-nrpe-config':
+		ensure => purged
+	}
+	package { 'dsa-nagios-checks':
+		ensure => installed,
+		tag    => extra_repo,
 	}
 
-	file {
-		"/etc/default/nagios-nrpe-server":
-			source  => [ "puppet:///nagios/per-host/$fqdn/default",
-			             "puppet:///nagios/common/default" ],
-			require => Package["nagios-nrpe-server"],
-			notify  => Exec["nagios-nrpe-server restart"];
-		"/etc/default/nagios-nrpe":
-			ensure  => absent,
-			notify  => Exec["nagios-nrpe-server restart"];
-		"/etc/nagios/nrpe.cfg":
-			source  => [ "puppet:///nagios/per-host/$fqdn/nrpe.cfg",
-			             "puppet:///nagios/common/nrpe.cfg" ],
-			require => Package["nagios-nrpe-server"],
-			notify  => Exec["nagios-nrpe-server restart"];
-		"/etc/nagios/nrpe.d":
-			mode    => 755,
-			require => Package["nagios-nrpe-server"],
-			ensure  => directory;
-		"/etc/nagios/nrpe.d/debianorg.cfg":
-                        content => template("nagios/inc-debian.org.erb"),
-			require => Package["nagios-nrpe-server"],
-			notify  => Exec["nagios-nrpe-server restart"];
-		"/etc/nagios/nrpe.d/nrpe_dsa.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/nrpe_dsa.cfg" ],
-			require => Package["dsa-nagios-checks"],
-			notify  => Exec["nagios-nrpe-server restart"];
+	service { 'nagios-nrpe-server':
+		ensure    => running,
+		hasstatus => false,
+		pattern   => 'nrpe',
+	}
 
-		"/etc/nagios/obsolete-packages-ignore":
-			source  => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore",
-			             "puppet:///nagios/common/obsolete-packages-ignore" ],
-			require => Package["dsa-nagios-checks"];
+	@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,
+	}
 
-		"/etc/nagios/obsolete-packages-ignore.d/hostspecific":
-                        content => template("nagios/obsolete-packages-ignore.d-hostspecific.erb"),
-			require => Package["dsa-nagios-checks"];
+	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':
+		source  => 'puppet:///modules/nagios/dsa-nagios/dsa-check-libs',
 	}
 
-	exec { "nagios-nrpe-server restart":
-		path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-		refreshonly => true,
-	}
-        @ferm::rule { "dsa-nagios":
-                description     => "Allow nrpe from nagios master",
-                rule            => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS) ACCEPT; }"
-        }
 }