X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=8500597b4403f1a6437476e298b6430c2a384c47;hb=2501702f1ad580fa9909d2576fb403189e3eea5c;hp=d13d45a293cb3248cc4c6edb4c8dbe7abb378d1a;hpb=7ea86ceb945c6a32da38bac080b0129c91f807eb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index d13d45a29..8500597b4 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
 	}
 
@@ -84,19 +86,74 @@ class roles {
 		include roles::mailrelay
 	}
 
+	if getfromhash($site::nodeinfo, 'pubsub') {
+		include roles::pubsub
+	}
+
+	if getfromhash($site::nodeinfo, 'dbmaster') {
+		ssl::service { 'db.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
 	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'],
 		}
 	}
+
+	if $::hostname in [nono] {
+		ssl::service { 'nm.debian.org':
+			notify => Service['apache2'],
+		}
+		ssl::service { 'contributors.debian.org':
+			notify => Service['apache2'],
+		}
+	}
 }