X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fserver.pp;h=95b4c3b544f150c6d62125a0a839a54a9cad61c0;hb=ad144c20d54eb33597becebd0734d64e7b2fdea6;hp=989e170c72feccd1a90432279833fa3df3ae0a22;hpb=6aa47d906ffb6a57f8633934469b348ee8665494;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index 989e170c7..95b4c3b54 100644
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -1,7 +1,6 @@
 class nagios::server {
 	include apache2
 	include apache2::ssl
-	include apache2::auth_digest
 	include apache2::authn_anon
 
 	ssl::service { 'nagios.debian.org':
@@ -13,6 +12,120 @@ class nagios::server {
 		content => template('nagios/nagios.debian.org.conf.erb'),
 	}
 
+	ensure_packages( [
+		'icinga',
+		'make',
+		'monitoring-plugins',
+		'nagios-nrpe-plugin',
+		], { ensure => 'installed' })
+
+	service { 'icinga':
+		ensure => running,
+		require => Package['icinga'],
+	}
+
+	file { '/etc/icinga/apache2.conf':
+		content => template('nagios/icinga-apache2.conf.erb'),
+		notify  => Exec['service apache2 reload'],
+	}
+	file { '/srv/nagios.debian.org/htpasswd':
+		mode => '0640',
+		owner => 'root',
+		group => 'www-data',
+	}
+	file { '/etc/icinga/cgi.cfg':
+		ensure => symlink,
+		target => 'config-pushed/static/cgi.cfg',
+		notify  => Exec['service apache2 reload'],
+	}
+	file { '/etc/icinga/icinga.cfg':
+		ensure => symlink,
+		target => 'config-pushed/static/icinga.cfg',
+		notify  => Service['icinga'],
+	}
+	file { '/etc/icinga/objects':
+		ensure  => directory,
+		mode    => '755',
+		purge   => true,
+		recurse => true,
+		force   => true,
+		source  => "puppet:///files/empty/",
+		notify  => Service['icinga'],
+	}
+	file { '/etc/icinga/objects/contacts.cfg':
+		ensure => symlink,
+		target => '../config-pushed/static/objects/contacts.cfg',
+		notify  => Service['icinga'],
+	}
+	file { '/etc/icinga/objects/generic-host.cfg':
+		ensure => symlink,
+		target => '../config-pushed/static/objects/generic-host.cfg',
+		notify  => Service['icinga'],
+	}
+	file { '/etc/icinga/objects/generic-service.cfg':
+		ensure => symlink,
+		target => '../config-pushed/static/objects/generic-service.cfg',
+		notify  => Service['icinga'],
+	}
+	file { '/etc/icinga/objects/timeperiods.cfg':
+		ensure => symlink,
+		target => '../config-pushed/static/objects/timeperiods.cfg',
+		notify  => Service['icinga'],
+	}
+
+	file { '/etc/icinga/objects/xauto-dependencies.cfg':
+		ensure => symlink,
+		target => '../config-pushed/generated/auto-dependencies.cfg',
+		notify  => Service['icinga'],
+	}
+	file { '/etc/icinga/objects/xauto-hostgroups.cfg':
+		ensure => symlink,
+		target => '../config-pushed/generated/auto-hostgroups.cfg',
+		notify  => Service['icinga'],
+	}
+	file { '/etc/icinga/objects/xauto-hosts.cfg':
+		ensure => symlink,
+		target => '../config-pushed/generated/auto-hosts.cfg',
+		notify  => Service['icinga'],
+	}
+	file { '/etc/icinga/objects/xauto-servicegroups.cfg':
+		ensure => symlink,
+		target => '../config-pushed/generated/auto-servicegroups.cfg',
+		notify  => Service['icinga'],
+	}
+	file { '/etc/icinga/objects/xauto-services.cfg':
+		ensure => symlink,
+		target => '../config-pushed/generated/auto-services.cfg',
+		notify  => Service['icinga'],
+	}
+
+	file { '/etc/nagios-plugins/config/local-dsa-checkcommands.cfg':
+		ensure => symlink,
+		target => '../../icinga/config-pushed/static/checkcommands.cfg',
+		notify  => Service['icinga'],
+	}
+	file { '/etc/nagios-plugins/config/local-dsa-eventhandlers.cfg':
+		ensure => symlink,
+		target => '../../icinga/config-pushed/static/eventhandlers.cfg',
+		notify  => Service['icinga'],
+	}
+
+	file { '/etc/icinga/config-pushed':
+		ensure => symlink,
+		target => '/srv/nagios.debian.org/config-pushed'
+	}
+
+	file { '/srv/nagios.debian.org':
+		ensure => directory,
+		mode => '0755',
+	}
+	file { '/srv/nagios.debian.org/config-pushed':
+		ensure => directory,
+		mode => '0755',
+		owner  => 'nagiosadm',
+		group  => 'nagiosadm',
+	}
+
 	concat::fragment { 'dsa-puppet-stuff--nagios--restart-stale-icinga':
 		target => '/etc/cron.d/dsa-puppet-stuff',
 		order  => '010',