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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index a15eecf1c..21559a8bc 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,6 +1,8 @@
 class roles {
 
-	if getfromhash($site::nodeinfo, 'puppetmaster') {
+	$roles = hiera('roles')
+
+	if $::fqdn in $roles['puppetmaster'] {
 		include puppetmaster
 	}
 
@@ -8,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
@@ -88,16 +93,65 @@ 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
 	}
 
+	if $::hostname in [vento] {
+		ssl::service { 'vote.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
 	if $::hostname in [soler] {
 		ssl::service { 'security-tracker.debian.org':
 			notify => Service['apache2'],
 		}
 	}
 
+	if $::hostname in [bendel] {
+		ssl::service { 'lists.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
+	if $::hostname in [reger] {
+		ssl::service { 'rt.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
+	if $::hostname in [diabelli] {
+		ssl::service { 'sso.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
+	if $::hostname in [ullmann] {
+		ssl::service { 'udd.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+	
+	if $::hostname in [wuiet] {
+		ssl::service { 'buildd.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
 	if $::hostname in [pejacevic] {
 		ssl::service { 'piuparts.debian.org':
 			notify => Service['apache2'],
@@ -112,4 +166,10 @@ class roles {
 			notify => Service['apache2'],
 		}
 	}
+
+	if $::hostname in [franck] {
+		ssl::service { 'release.debian.org':
+			notify => Service['apache2'],
+		}
+	}
 }