X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=21559a8bc11d37bb1560c7c03c617be5f1877820;hb=683ffc212c9c3a4d7e4a4ff98c94fb52a75a02ca;hp=fe34651c2a3d4599c2d71faf71a41d0b24787e63;hpb=da0667e79d59dc41ab7b0ccb2f6f78d666cf7018;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index fe34651c2..21559a8bc 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
@@ -90,6 +93,19 @@ class roles {
 		include roles::pubsub
 	}
 
+	if getfromhash($site::nodeinfo, 'dbmaster') {
+		ssl::service { 'db.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
+	if getfromhash($site::nodeinfo, 'dns_primary') {
+		include named::primary
+	}
+	if getfromhash($site::nodeinfo, 'dns_secondary') {
+		include named::authoritative
+	}
+
 	if $::hostname in [ravel] {
 		include roles::weblog_destination
 	}
@@ -150,4 +166,10 @@ class roles {
 			notify => Service['apache2'],
 		}
 	}
+
+	if $::hostname in [franck] {
+		ssl::service { 'release.debian.org':
+			notify => Service['apache2'],
+		}
+	}
 }