X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=83ddc6c30da0e392bf087982ca21f1bf2bbe7d05;hb=d165b198d00bc06003487f344350d5366d1b39bd;hp=1c4dc9d534453ed5548ebe62ec00d89796869eed;hpb=6e84404e107294d258f571d6a73900d0c9eb114c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 1c4dc9d53..83ddc6c30 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,12 +34,6 @@ 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
 	}
@@ -66,10 +56,6 @@ class roles {
 		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
 	}
@@ -82,10 +68,6 @@ class roles {
 		include roles::mailrelay
 	}
 
-	if has_role('pubsub') {
-		include roles::pubsub
-	}
-
 	if has_role('dns_primary') {
 		include roles::dns_primary
 	}
@@ -134,40 +116,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
 	}
@@ -195,17 +143,9 @@ class roles {
 		ssl::service { 'l10n.debian.org': 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
@@ -213,24 +153,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
 	}
@@ -238,8 +165,4 @@ class roles {
 	if has_role('popcon') {
 		include roles::popcon
 	}
-
-	if has_role('debsources') {
-		include roles::debsources
-	}
 }