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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 647f4576a..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
 	}
 
@@ -9,13 +11,20 @@ class roles {
 	}
 
 	if getfromhash($site::nodeinfo, 'nagiosmaster') {
-		include nagios::server
+	#	include nagios::server
+		ssl::service { 'nagios.debian.org':
+			notify => Service['apache2'],
+		}
 	}
 
 	if getfromhash($site::nodeinfo, 'buildd') {
 		include buildd
 	}
 
+	if getfromhash($site::nodeinfo, 'porterbox') {
+		include porterbox
+	}
+
 	if getfromhash($site::nodeinfo, 'bugs_mirror') {
 		include roles::bugs_mirror
 	}
@@ -33,10 +42,6 @@ class roles {
 		include roles::www_mirror
 	}
 
-	if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-		include roles::backports_mirror
-	}
-
 	if getfromhash($site::nodeinfo, 'ftp.d.o') {
 		include roles::ftp
 	}
@@ -45,11 +50,6 @@ class roles {
 		include roles::ftp_upload
 	}
 
-	if getfromhash($site::nodeinfo, 'backports_master') {
-		include roles::backports_master
-		include roles::dakmaster
-	}
-
 	if getfromhash($site::nodeinfo, 'security_master') {
 		include roles::security_master
 		include roles::dakmaster
@@ -63,7 +63,113 @@ class roles {
 		include roles::keyring
 	}
 
-	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-		include roles::ftp-upcoming_mirror
+	if getfromhash($site::nodeinfo, 'wiki') {
+		include roles::wiki
+	}
+
+	if getfromhash($site::nodeinfo, 'syncproxy') {
+		include roles::syncproxy
+	}
+
+	if getfromhash($site::nodeinfo, 'static_master') {
+		include roles::static_master
+	}
+
+	if getfromhash($site::nodeinfo, 'static_mirror') {
+		include roles::static_mirror
+	} elsif getfromhash($site::nodeinfo, 'static_source') {
+		include roles::static_source
+	}
+
+	if getfromhash($site::nodeinfo, 'weblog_provider') {
+		include roles::weblog_provider
+	}
+
+	if getfromhash($site::nodeinfo, 'mailrelay') {
+		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 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'],
+		}
+	}
+
+	if $::hostname in [nono] {
+		ssl::service { 'nm.debian.org':
+			notify => Service['apache2'],
+		}
+		ssl::service { 'contributors.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
+	if $::hostname in [franck] {
+		ssl::service { 'release.debian.org':
+			notify => Service['apache2'],
+		}
 	}
 }