X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=f1e24a7401c90f86874d154782c762464794722a;hb=05d85da88ba1a535370935ef64ada618185f2bbd;hp=09bf30827daecaf4ff568255032681cb606edead;hpb=2449557935018f7b7afcf9cd9026ec13bc3b4a9b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 09bf30827..f1e24a740 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -15,10 +15,6 @@ class roles {
 		include nagios::server
 	}
 
-	if has_role('manpages-dyn') {
-		include roles::manpages_dyn
-	}
-
 	# archive.debian.org
 	if has_role('historical_mirror') {
 		include roles::historical_mirror
@@ -38,21 +34,12 @@ class roles {
 		include roles::dakmaster
 		include roles::signing
 	}
-	if has_role('ftp.upload.d.o') {
-		include roles::ftp_upload
-	}
 	if has_role('ssh.upload.d.o') {
 		include roles::ssh_upload
 	}
 	if has_role('security_upload') {
 		include roles::security_upload
 	}
-	if has_role('api.ftp-master') {
-		ssl::service { 'api.ftp-master.debian.org':
-			notify  => Exec['service apache2 reload'],
-			key => true,
-		}
-	}
 	#
 	# security.debian.org
 	if has_role('security_master') {
@@ -68,19 +55,10 @@ class roles {
 		include roles::git_master
 	}
 
-	if has_role('people') {
-		ssl::service { 'people.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-		onion::service { 'people.debian.org': port => 80, target_address => 'people.debian.org', target_port => 80, direct => true }
-	}
-
 	if has_role('www_master') {
 		include roles::www_master
 	}
 
-	if has_role('cgi.d.o') {
-		ssl::service { 'cgi.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-	}
-
 	if has_role('wiki') {
 		include roles::wiki
 	}
@@ -93,14 +71,6 @@ class roles {
 		include roles::mailrelay
 	}
 
-	if has_role('pubsub') {
-		include roles::pubsub
-	}
-
-	if has_role('dbmaster') {
-		include roles::dbmaster
-	}
-
 	if has_role('dns_primary') {
 		include roles::dns_primary
 	}
@@ -129,14 +99,6 @@ class roles {
 		include roles::sso_rp
 	}
 
-	if has_role('contributors') {
-		include roles::contributors
-	}
-
-	if has_role('nm') {
-		include roles::nm
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
@@ -157,40 +119,6 @@ class roles {
 		ssl::service { 'packages.qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
-	if has_role('gobby_debian_org') {
-		ssl::service { 'gobby.debian.org':
-			notify  => [ Exec['service apache2 reload'], Exec['reload gobby'] ],
-			key => true,
-			tlsaport => [443, 6523],
-		}
-		file { '/etc/ssl/debian-local/other-keys/gobby.debian.org.key':
-			ensure => present,
-			mode => '0440',
-			group => 'gobby',
-			content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.letsencrypt_dir"]) + "/gobby.debian.org.key") %>'),
-			links => follow,
-			notify => Exec['reload gobby'],
-		}
-		exec { 'reload gobby':
-			command => 'pkill -u gobby -HUP -x infinoted',
-			refreshonly => true,
-		}
-	}
-
-	if has_role('search_backend') {
-		include roles::search_backend
-	}
-	if has_role('search_frontend') {
-		include roles::search_frontend
-	}
-
-	if has_role('dgit_browse') {
-		include roles::dgit_browse
-	}
-	if has_role('dgit_git') {
-		include roles::dgit_git
-	}
-
 	if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
 		include roles::snapshot
 	}
@@ -203,10 +131,6 @@ class roles {
 		include roles::snapshot_shell
 	}
 
-	if has_role('debtags') {
-		include roles::debtags
-	}
-
 	if has_role('planet_master') {
 		include roles::planet_master
 	}
@@ -222,21 +146,9 @@ class roles {
 		ssl::service { 'l10n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
-	if has_role('dedup.d.n') {
-		ssl::service { 'dedup.debian.net': notify  => Exec['service apache2 reload'], key => true, }
-	}
-
-	if has_role('pet.d.n') {
-		ssl::service { 'pet.debian.net': notify  => Exec['service apache2 reload'], key => true, }
-		ssl::service { 'pet-devel.debian.net': notify  => Exec['service apache2 reload'], key => true, }
-	}
-
 	if has_role('ports_master') {
 		include roles::ports_master
 	}
-	if has_role('ports_mirror') {
-		include roles::ports_mirror
-	}
 
 	if has_role('onionbalance') {
 		include onion::balance
@@ -244,24 +156,11 @@ class roles {
 	if has_role('bgp') {
 		include roles::bgp
 	}
-	if has_role('cdimage-search') {
-		include roles::cdimage_search
-	}
 
 	if has_role('postgresql_server') {
 		include postgres::backup_source
 	}
 
-	if has_role('bacula_director') {
-		include bacula::director
-	} else {
-		package { 'bacula-console': ensure => purged; }
-		file { '/etc/bacula/bconsole.conf': ensure => absent; }
-	}
-	if has_role('bacula_storage') {
-		include bacula::storage
-	}
-
 	if $::keyring_debian_org_mirror {
 		include roles::keyring_debian_org_mirror
 	}
@@ -269,8 +168,4 @@ class roles {
 	if has_role('popcon') {
 		include roles::popcon
 	}
-
-	if has_role('debsources') {
-		include roles::debsources
-	}
 }