X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fserver.pp;h=1bbd5769e1d44ffc09322db45b2f2e24576a7f45;hb=bff226712d8b7fff2060114bb75d4dd9c9cbb601;hp=5cdbc43be8f111af0d63948034d3316600348b34;hpb=a7de4760fbf6d2bb39eea6c62c75fe0f2a016367;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index 5cdbc43be..1bbd5769e 100644
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -1,81 +1,105 @@
-class nagios::server inherits nagios::client {
-	package {
-		nagios3: ensure => installed;
-		nagios-nrpe-plugin: ensure => installed;
-		nagios-plugins: ensure => installed;
-		nagios-images: ensure => installed;
-	}
-
-	file {
-		"/etc/nagios-plugins/config/local-dsa-checkcommands.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/checkcommands.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-
-		"/etc/nagios3/cgi.cfg":
-			source  => [ "puppet:///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" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
+class nagios::server {
 
-		"/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" ],
-			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" ],
-			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" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-		"/etc/nagios3/puppetconf.d/timeperiods.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/timeperiods.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
+	package { [
+			'nagios3',
+			'nagios-nrpe-plugin',
+			'nagios-plugins',
+			'nagios-images'
+		]:
+		ensure => installed
+	}
 
-		"/etc/nagios3/puppetconf.d/auto-dependencies.cfg":
-			source  => [ "puppet:///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" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-		"/etc/nagios3/puppetconf.d/auto-hostgroups.cfg":
-			source  => [ "puppet:///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" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-		"/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg":
-			source  => [ "puppet:///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" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
-		"/etc/nagios3/puppetconf.d/auto-services.cfg":
-			source  => [ "puppet:///nagios/dsa-nagios/generated/auto-services.cfg" ],
-			require => Package["nagios3"],
-			notify  => Exec["nagios3 reload"];
+	file { '/etc/init.d/nagios3':
+		source  => 'puppet:///modules/nagios/nagios3.init',
+		mode    => '0755',
+		require => Package['nagios3'],
+		before  => Service['nagios3'],
+	}
 
+	service { 'nagios3':
+		ensure  => running,
+		require => Package['nagios3'],
 	}
 
-	exec { "nagios3 reload":
-		path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-		refreshonly => true,
+	file { '/etc/nagios-plugins/config':
+		ensure  => directory,
+		recurse => remote,
+		source  => 'puppet:///files/empty/',
+		require => Package['nagios3'],
+		notify  => Service['nagios3'],
+	}
+	file { '/etc/nagios3':
+		ensure  => directory,
+		recurse => remote,
+		source  => 'puppet:///files/empty/',
+		require => Package['nagios3'],
+		notify  => Service['nagios3'],
+	}
+	file { '/etc/nagios3/puppetconf.d':
+		ensure => directory,
+		recurse => remote,
+		source  => 'puppet:///files/empty/',
+		require => Package['nagios3'],
+		notify  => Service['nagios3'],
+	}
+	file { '/etc/nagios-plugins/config/local-dsa-checkcommands.cfg':
+		source => 'puppet:///modules/nagios/dsa-nagios/static/checkcommands.cfg',
+		notify => Service['nagios3'],
+	}
+	file { '/etc/nagios-plugins/config/local-dsa-eventhandlers.cfg':
+		source => 'puppet:///modules/nagios/dsa-nagios/static/eventhandlers.cfg',
+		notify => Service['nagios3'],
+	}
+	file { '/etc/nagios3/cgi.cfg':
+		source => 'puppet:///modules/nagios/dsa-nagios/static/cgi.cfg',
+		notify => Service['nagios3'],
+	}
+	file { '/etc/nagios3/nagios.cfg':
+		source => 'puppet:///modules/nagios/dsa-nagios/static/nagios.cfg',
+		notify => Service['nagios3'],
+	}
+	file { '/etc/nagios3/puppetconf.d/contacts.cfg':
+		source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/contacts.cfg',
+		notify => Service['nagios3'],
+	}
+	file { '/etc/nagios3/puppetconf.d/generic-host.cfg':
+		source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-host.cfg',
+		notify => Service['nagios3'],
+	}
+	file { '/etc/nagios3/puppetconf.d/generic-service.cfg':
+		source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-service.cfg',
+		notify => Service['nagios3'],
+	}
+	file { '/etc/nagios3/puppetconf.d/timeperiods.cfg':
+		source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/timeperiods.cfg',
+		notify => Service['nagios3'],
+	}
+	file { '/etc/nagios3/puppetconf.d/auto-dependencies.cfg':
+		source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-dependencies.cfg',
+		notify => Service['nagios3'],
+	}
+	file { '/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg':
+		source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-hostextinfo.cfg',
+		notify => Service['nagios3'],
+	}
+	file { '/etc/nagios3/puppetconf.d/auto-hostgroups.cfg':
+		source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-hostgroups.cfg',
+		notify => Service['nagios3'],
+	}
+	file { '/etc/nagios3/puppetconf.d/auto-hosts.cfg':
+		source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-hosts.cfg',
+		notify => Service['nagios3'],
+	}
+	file { '/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg':
+		source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-serviceextinfo.cfg',
+		notify => Service['nagios3'],
+	}
+	file { '/etc/nagios3/puppetconf.d/auto-servicegroups.cfg':
+		source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-servicegroups.cfg',
+		notify => Service['nagios3'],
+	}
+	file { '/etc/nagios3/puppetconf.d/auto-services.cfg':
+		source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-services.cfg',
+		notify => Service['nagios3'],
 	}
 }