X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=6e6976eab8a3b67a6f4b8e9386936647a66ff7a2;hb=b37efa5c3fe30796344d4c15f6495345b00d4abe;hp=f8d04d1c3b0f8af66a88db3807d37742426ecd3b;hpb=648cddfcd23cee082395ee8f5caba7be151c71d3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index f8d04d1c3..6e6976eab 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -52,10 +52,11 @@ class roles {
 		include roles::manpages_dyn
 	}
 
-	# archive.debian.org
-	if has_role('historical_master') {
-		include historical_master
+	if has_role('archvsync_base_additional') {
+		include archvsync_base
 	}
+
+	# archive.debian.org
 	if has_role('historical_mirror') {
 		include roles::historical_mirror
 	}
@@ -75,6 +76,7 @@ class roles {
 	if has_role('ftp_master') {
 		include roles::ftp_master
 		include roles::dakmaster
+		include roles::signing
 	}
 	if has_role('ftp.upload.d.o') {
 		include roles::ftp_upload
@@ -82,6 +84,9 @@ class roles {
 	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'],
@@ -173,10 +178,6 @@ class roles {
 		include roles::lists
 	}
 
-	if has_role('list_search') {
-		include roles::listsearch
-	}
-
 	if has_role('rtmaster') {
 		include roles::rtmaster
 	}
@@ -204,6 +205,9 @@ class roles {
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
+	if has_role('piuparts_slave') {
+		include roles::piuparts_slave
+	}
 
 	if has_role('contributors') {
 		include roles::contributors
@@ -221,17 +225,6 @@ class roles {
 		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
 	}
@@ -240,6 +233,10 @@ class roles {
 		ssl::service { 'packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
+	if has_role('historicalpackages') {
+		ssl::service { 'historical.packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+	}
+
 	if has_role('qamaster') {
 		ssl::service { 'qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
@@ -253,21 +250,21 @@ class roles {
 	}
 
 	if has_role('search_backend') {
-		include search_backend
+		include roles::search_backend
 	}
 	if has_role('search_frontend') {
-		include search_frontend
+		include roles::search_frontend
 	}
 
 	if has_role('dgit_browse') {
-		include dgit_browse
+		include roles::dgit_browse
 	}
 	if has_role('dgit_git') {
-		include dgit_git
+		include roles::dgit_git
 	}
 
 	if $::hostname in [lw01, lw02, lw03, lw04] {
-		include snapshot
+		include roles::snapshot
 	}
 
 	if has_role('veyepar.debian.org') {
@@ -277,10 +274,6 @@ class roles {
 		ssl::service { 'sreview.debian.net': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
-	if has_role('httpredir') {
-		include roles::httpredir
-	}
-
 	if has_role('debtags') {
 		include roles::debtags
 	}
@@ -313,9 +306,6 @@ class roles {
 		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 onion::balance
 	}
@@ -325,4 +315,26 @@ class roles {
 	if has_role('cdimage-search') {
 		include roles::cdimage_search
 	}
+
+	if has_role('postgresql_server') {
+		include roles::postgresql_server
+	}
+
+	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 has_role('salsa.debian.org') {
+		include salsa
+	}
+
+	if $::keyring_debian_org_mirror {
+		include roles::keyring_debian_org_mirror
+	}
 }