X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=1b67879b6ddfc2cd5d0f89bcf1d51a139b3f50f2;hb=c54d3c0937444eb08707008c85d9e8734448c135;hp=4dcdb384d3aa72c9c49c8bb5a5b23202b885bf7c;hpb=9183664fc9f40ea1e192c9751cbaa839d34c39fb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 4dcdb384d..1b67879b6 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,90 +1,363 @@
+# = Class: roles
+#
+# Lookup role and include relevant classes for roles
+#
+# == Sample Usage:
+#
+#   include roles
+#
 class roles {
 
-	if getfromhash($site::nodeinfo, '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('archive_master') {
+		include archive_master
+	}
+
+	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'],
+			key => true,
+		}
+	}
+
+	if has_role('ftp_master') {
 		include roles::ftp_master
 		include roles::dakmaster
 	}
 
-	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
-		include roles::security_mirror
+	if has_role('api.ftp-master') {
+		ssl::service { 'api.ftp-master.debian.org':
+			notify => Service['apache2'],
+		}
 	}
 
-	if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
-		include roles::www_mirror
+	if has_role('manpages') {
+		ssl::service { 'manpages.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
 	}
 
-	if getfromhash($site::nodeinfo, 'ftp.d.o') {
+	if has_role('security_mirror') {
+		include roles::security_mirror
+	}
+	if has_role('debug_mirror') {
+		include roles::debug_mirror
+	}
+
+	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('ssh.upload.d.o') {
+		include roles::ssh_upload
+	}
+
+	if has_role('git_master') {
+		include roles::git_master
+	}
+
+	if has_role('people') {
+		ssl::service { 'people.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	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('cgi.d.o') {
+		ssl::service { 'cgi.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	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 $::hostname in [ravel] {
+	if has_role('pubsub') {
+		include roles::pubsub
+	}
+
+	if has_role('dbmaster') {
+		include roles::dbmaster
+	}
+
+	if has_role('dns_primary') {
+		include named::primary
+	}
+
+	if has_role('weblog_destination') {
 		include roles::weblog_destination
 	}
+
+	if has_role('vote') {
+		include roles::vote
+	}
+
+	if has_role('security_tracker') {
+		include roles::security_tracker
+	}
+
+	if has_role('lists') {
+		include roles::lists
+	}
+
+	if has_role('list_search') {
+		include roles::listsearch
+	}
+
+	if has_role('rtmaster') {
+		include roles::rtmaster
+	}
+
+	if has_role('udd') {
+		include roles::udd
+	}
+
+	if has_role('sso') {
+		include roles::sso
+	}
+
+	if has_role('sso_rp') {
+		include roles::sso_rp
+	}
+
+	if has_role('tracker') {
+		include roles::tracker
+	}
+
+	if has_role('buildd_master') {
+		include roles::buildd_master
+	}
+
+	if has_role('piuparts') {
+		include roles::piuparts
+	}
+
+	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('jenkins') {
+		include roles::jenkins
+	}
+
+	if has_role('keystone') {
+		include roles::keystone
+	}
+	if has_role('keystone_rabbitmq') {
+		include roles::keystone::rabbitmq
+	}
+
+	if has_role('memcached') {
+		include roles::memcached
+	}
+
+	if has_role('postgres_backup_server') {
+		include postgres::backup_server
+	}
+
+	if has_role('packages') {
+		ssl::service { 'packages.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	if has_role('qamaster') {
+		ssl::service { 'qa.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	if has_role('packagesqamaster') {
+		ssl::service { 'packages.qa.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	if has_role('gobby_debian_org') {
+		ssl::service { 'gobby.debian.org':
+			notify => Service['apache2'],
+			key => true,
+			tlsaport => [443, 6523],
+		}
+	}
+
+	if has_role('search_backend') {
+		include search_backend
+	}
+	if has_role('search_frontend') {
+		include search_frontend
+	}
+
+	if has_role('dgit_browse') {
+		include dgit_browse
+	}
+	if has_role('dgit_git') {
+		include dgit_git
+	}
+
+	if $::hostname in [lw01, lw02, lw03, lw04] {
+		include snapshot
+	}
+
+	if has_role('veyepar.debian.org') {
+		ssl::service { 'veyepar.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	if has_role('httpredir') {
+		include roles::httpredir
+	}
+
+	if has_role('debtags') {
+		include roles::debtags
+	}
+
+	if has_role('planet_search') {
+		ssl::service { 'planet-search.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	if has_role('i18n.d.o') {
+		ssl::service { 'i18n.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	if has_role('l10n.d.o') {
+		ssl::service { 'l10n.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	if has_role('dedup.d.n') {
+		ssl::service { 'dedup.debian.net':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	if has_role('pet.d.n') {
+		ssl::service { 'pet.debian.net':
+			notify => Service['apache2'],
+			key => true,
+		}
+		ssl::service { 'pet-devel.debian.net':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	if has_role('ports-master') {
+		include roles::ports-master
+	}
+	if has_role('ports_mirror') {
+		include roles::ports_mirror
+	}
+
+	if $::hostname in [klecker] {
+		onion::service { 'ftp.debian.org':
+			port => 80,
+			target_address => '130.89.148.12',
+			target_port => 81,
+		}
+	}
+	if has_role('onionbalance') {
+		include roles::onionbalance
+	}
 }