X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=3eb5dfdb5f2bf51c87d6391cb3c23267427088a2;hb=8bb003cb1bb6c12b3909547aae210a46b609d0cd;hp=21559a8bc11d37bb1560c7c03c617be5f1877820;hpb=683ffc212c9c3a4d7e4a4ff98c94fb52a75a02ca;p=dsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 21559a8b..3eb5dfdb 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,174 +1,180 @@
 class roles {
 
-	$roles = hiera('roles')
-
-	if $::fqdn in $roles['puppetmaster'] {
+	if has_role('puppetmaster') {
 		include puppetmaster
 	}
 
-	if getfromhash($site::nodeinfo, 'muninmaster') {
+	if has_role('muninmaster') {
 		include munin::master
 	}
 
-	if getfromhash($site::nodeinfo, 'nagiosmaster') {
+	if has_role('nagiosmaster') {
 	#	include nagios::server
 		ssl::service { 'nagios.debian.org':
 			notify => Service['apache2'],
 		}
 	}
 
+	# XXX: turn this into a real role
 	if getfromhash($site::nodeinfo, 'buildd') {
 		include buildd
 	}
 
+	# XXX: turn this into a real role
 	if getfromhash($site::nodeinfo, 'porterbox') {
 		include porterbox
 	}
 
-	if getfromhash($site::nodeinfo, 'bugs_mirror') {
+	if has_role('bugs_mirror') {
 		include roles::bugs_mirror
 	}
 
-	if getfromhash($site::nodeinfo, 'ftp_master') {
+	if has_role('bugs_base') {
+		ssl::service { 'bugs.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+	if has_role('bugs_master') {
+		ssl::service { 'bugs-master.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
+	if has_role('ftp_master') {
 		include roles::ftp_master
 		include roles::dakmaster
 	}
 
+	# XXX: turn this into a real role
 	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
 		include roles::security_mirror
 	}
 
+	# XXX: turn this into a real role
 	if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
 		include roles::www_mirror
 	}
 
-	if getfromhash($site::nodeinfo, 'ftp.d.o') {
+	if has_role('ftp.d.o') {
 		include roles::ftp
 	}
 
-	if getfromhash($site::nodeinfo, 'ftp.upload.d.o') {
+	if has_role('ftp.upload.d.o') {
 		include roles::ftp_upload
 	}
 
-	if getfromhash($site::nodeinfo, 'security_master') {
+	if has_role('security_master') {
 		include roles::security_master
 		include roles::dakmaster
 	}
 
-	if getfromhash($site::nodeinfo, 'www_master') {
+	if has_role('www_master') {
 		include roles::www_master
 	}
 
-	if getfromhash($site::nodeinfo, 'keyring') {
+	if has_role('keyring') {
 		include roles::keyring
 	}
 
-	if getfromhash($site::nodeinfo, 'wiki') {
+	if has_role('wiki') {
 		include roles::wiki
 	}
 
-	if getfromhash($site::nodeinfo, 'syncproxy') {
+	if has_role('syncproxy') {
 		include roles::syncproxy
 	}
 
-	if getfromhash($site::nodeinfo, 'static_master') {
+	if has_role('static_master') {
 		include roles::static_master
 	}
 
-	if getfromhash($site::nodeinfo, 'static_mirror') {
+	if has_role('static_mirror') {
 		include roles::static_mirror
-	} elsif getfromhash($site::nodeinfo, 'static_source') {
+	} elsif has_role('static_source') {
 		include roles::static_source
 	}
 
-	if getfromhash($site::nodeinfo, 'weblog_provider') {
+	if has_role('weblog_provider') {
 		include roles::weblog_provider
 	}
 
-	if getfromhash($site::nodeinfo, 'mailrelay') {
+	if has_role('mailrelay') {
 		include roles::mailrelay
 	}
 
-	if getfromhash($site::nodeinfo, 'pubsub') {
+	if has_role('pubsub') {
 		include roles::pubsub
 	}
 
-	if getfromhash($site::nodeinfo, 'dbmaster') {
-		ssl::service { 'db.debian.org':
-			notify => Service['apache2'],
-		}
+	if has_role('dbmaster') {
+		include roles::dbmaster
 	}
 
-	if getfromhash($site::nodeinfo, 'dns_primary') {
+	if has_role('dns_primary') {
 		include named::primary
 	}
-	if getfromhash($site::nodeinfo, 'dns_secondary') {
+	if has_role('dns_secondary') {
 		include named::authoritative
 	}
 
-	if $::hostname in [ravel] {
+	if has_role('weblog_destination') {
 		include roles::weblog_destination
 	}
 
-	if $::hostname in [vento] {
-		ssl::service { 'vote.debian.org':
-			notify => Service['apache2'],
-		}
+	if has_role('vote') {
+		include roles::vote
 	}
 
-	if $::hostname in [soler] {
-		ssl::service { 'security-tracker.debian.org':
-			notify => Service['apache2'],
-		}
+	if has_role('security_tracker') {
+		include roles::security_tracker
 	}
 
-	if $::hostname in [bendel] {
-		ssl::service { 'lists.debian.org':
-			notify => Service['apache2'],
-		}
+	if has_role('lists') {
+		include roles::lists
 	}
 
-	if $::hostname in [reger] {
-		ssl::service { 'rt.debian.org':
-			notify => Service['apache2'],
-		}
+	if has_role('rtmaster') {
+		include roles::rtmaster
 	}
 
-	if $::hostname in [diabelli] {
-		ssl::service { 'sso.debian.org':
-			notify => Service['apache2'],
-		}
+	if has_role('udd') {
+		include roles::udd
 	}
 
-	if $::hostname in [ullmann] {
-		ssl::service { 'udd.debian.org':
-			notify => Service['apache2'],
-		}
+	if has_role('sso') {
+		include roles::sso
 	}
-	
-	if $::hostname in [wuiet] {
-		ssl::service { 'buildd.debian.org':
-			notify => Service['apache2'],
-		}
+
+	if has_role('buildd_master') {
+		include roles::buildd_master
 	}
 
-	if $::hostname in [pejacevic] {
-		ssl::service { 'piuparts.debian.org':
-			notify => Service['apache2'],
-		}
+	if has_role('piuparts') {
+		include roles::piuparts
 	}
 
-	if $::hostname in [nono] {
-		ssl::service { 'nm.debian.org':
-			notify => Service['apache2'],
-		}
-		ssl::service { 'contributors.debian.org':
-			notify => Service['apache2'],
-		}
+	if has_role('contributors') {
+		include roles::contributors
+	}
+
+	if has_role('nm') {
+		include roles::nm
+	}
+
+	if has_role('release') {
+		include roles::release
+	}
+
+	if has_role('rtc') {
+		include roles::rtc
+	}
+
+	if has_role('postgres_backup_server') {
+		include postgres::backup_server
 	}
 
-	if $::hostname in [franck] {
-		ssl::service { 'release.debian.org':
+	if has_role('packages') {
+		ssl::service { 'packages.debian.org':
 			notify => Service['apache2'],
 		}
 	}