From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 1 Jan 2014 19:55:08 +0000 (+0100)
Subject: put nagios cert onto nagios host by role
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d7d799494711c0901fda4dd974481a796cad4148;p=mirror%2Fdsa-puppet.git

put nagios cert onto nagios host by role
---

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 1a282d871..28ea0ac30 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -10,9 +10,12 @@ class roles {
 		include munin::master
 	}
 
-	#if getfromhash($site::nodeinfo, 'nagiosmaster') {
+	if getfromhash($site::nodeinfo, 'nagiosmaster') {
 	#	include nagios::server
-	#}
+		ssl::service { 'nagios.debian.org':
+			notify => Service['apache2'],
+		}
+	}
 
 	if getfromhash($site::nodeinfo, 'buildd') {
 		include buildd
@@ -130,12 +133,6 @@ class roles {
 		}
 	}
 
-	if $::hostname in [tchaikovsky] {
-		ssl::service { 'nagios.debian.org':
-			notify => Service['apache2'],
-		}
-	}
-
 	if $::hostname in [ullmann] {
 		ssl::service { 'udd.debian.org':
 			notify => Service['apache2'],