X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fserver.pp;h=f73d8ad25fab7f3edfbef49bdd9dea32db669684;hb=1e65fd8f043823ed2021478f1ed95f1ec902dd9c;hp=39a48ff394a1f0c006f7d6139c787ad673c2e035;hpb=b868d89e2521786a56e74ceadf819c7fd99d56ae;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index 39a48ff39..f73d8ad25 100644
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -8,66 +8,71 @@ class nagios::server inherits nagios::client {
 
 	file {
 		"/etc/nagios-plugins/config/local-dsa-checkcommands.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/checkcommands.cfg" ],
+			source  => [ "puppet:///modules/nagios/dsa-nagios/static/checkcommands.cfg" ],
+			require => Package["nagios3"],
+			notify  => Exec["nagios3 reload"];
+		"/etc/nagios-plugins/config/local-dsa-eventhandlers.cfg":
+			source  => [ "puppet:///modules/nagios/dsa-nagios/static/eventhandlers.cfg" ],
 			require => Package["nagios3"],
 			notify  => Exec["nagios3 reload"];
 
 		"/etc/nagios3/cgi.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/cgi.cfg" ],
+			source  => [ "puppet:///modules/nagios/dsa-nagios/static/cgi.cfg" ],
 			require => Package["nagios3"],
 			notify  => Exec["nagios3 reload"];
 		"/etc/nagios3/nagios.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/nagios.cfg" ],
+			source  => [ "puppet:///modules/nagios/dsa-nagios/static/nagios.cfg" ],
 			require => Package["nagios3"],
 			notify  => Exec["nagios3 reload"];
 
 		"/etc/nagios3/puppetconf.d":
 			mode    => 755,
+			require => Package["nagios3"],
 			ensure  => directory;
 
 		"/etc/nagios3/puppetconf.d/contacts.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/contacts.cfg" ],
+			source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/contacts.cfg" ],
 			require => Package["nagios3"],
 			notify  => Exec["nagios3 reload"];
 		"/etc/nagios3/puppetconf.d/generic-host.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-host.cfg" ],
+			source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-host.cfg" ],
 			require => Package["nagios3"],
 			notify  => Exec["nagios3 reload"];
 		"/etc/nagios3/puppetconf.d/generic-service.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-service.cfg" ],
+			source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-service.cfg" ],
 			require => Package["nagios3"],
 			notify  => Exec["nagios3 reload"];
 		"/etc/nagios3/puppetconf.d/timeperiods.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/timeperiods.cfg" ],
+			source  => [ "puppet:///modules/nagios/dsa-nagios/static/conf.d/timeperiods.cfg" ],
 			require => Package["nagios3"],
 			notify  => Exec["nagios3 reload"];
 
 		"/etc/nagios3/puppetconf.d/auto-dependencies.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-dependencies.cfg" ],
+			source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-dependencies.cfg" ],
 			require => Package["nagios3"],
 			notify  => Exec["nagios3 reload"];
 		"/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hostextinfo.cfg" ],
+			source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-hostextinfo.cfg" ],
 			require => Package["nagios3"],
 			notify  => Exec["nagios3 reload"];
 		"/etc/nagios3/puppetconf.d/auto-hostgroups.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hostgroups.cfg" ],
+			source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-hostgroups.cfg" ],
 			require => Package["nagios3"],
 			notify  => Exec["nagios3 reload"];
 		"/etc/nagios3/puppetconf.d/auto-hosts.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hosts.cfg" ],
+			source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-hosts.cfg" ],
 			require => Package["nagios3"],
 			notify  => Exec["nagios3 reload"];
 		"/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-serviceextinfo.cfg" ],
+			source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-serviceextinfo.cfg" ],
 			require => Package["nagios3"],
 			notify  => Exec["nagios3 reload"];
 		"/etc/nagios3/puppetconf.d/auto-servicegroups.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-servicegroups.cfg" ],
+			source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-servicegroups.cfg" ],
 			require => Package["nagios3"],
 			notify  => Exec["nagios3 reload"];
 		"/etc/nagios3/puppetconf.d/auto-services.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-services.cfg" ],
+			source  => [ "puppet:///modules/nagios/dsa-nagios/generated/auto-services.cfg" ],
 			require => Package["nagios3"],
 			notify  => Exec["nagios3 reload"];
 
@@ -78,3 +83,6 @@ class nagios::server inherits nagios::client {
 		refreshonly => true,
 	}
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: