From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 1 Jun 2018 08:56:10 +0000 (+0200)
Subject: start using nagios::server again, move cert setup there
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=280ed24a63c02b5346068b886f884dbb34f26f3f

start using nagios::server again, move cert setup there
---

diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index 314dfb0c3..ab584052a 100644
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -1,4 +1,9 @@
 class nagios::server {
+	ssl::service { 'nagios.debian.org':
+		notify  => Exec['service apache2 reload'],
+		key => true,
+	}
+
 	concat::fragment { 'dsa-puppet-stuff--nagios--restart-stale-icinga':
 		target => '/etc/cron.d/dsa-puppet-stuff',
 		order  => '010',
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 864eb4928..e6d6d0643 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -17,11 +17,7 @@ class roles {
 	}
 
 	if has_role('nagiosmaster') {
-	#	include nagios::server
-		ssl::service { 'nagios.debian.org':
-			notify  => Exec['service apache2 reload'],
-			key => true,
-		}
+		include nagios::server
 	}
 
 	# XXX: turn this into a real role