X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=101058d15a443dfe20163357c5de016db6b24ac5;hb=9eea0ce0a67aa24badf63bfbdc773a78842e110a;hp=b64450dfedf4c9eb3eb63c4112ef34608a776f4c;hpb=c828a1b822d2987966270de951718a77b2a08511;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index b64450dfe..101058d15 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -71,11 +71,15 @@ class roles {
 		include roles::debian_mirror
 	}
 	if has_role('ftp.d.o') {
-		include roles::ftp
+		vsftpd::site { 'ftp':
+			ensure	=> absent,
+			root	=> '/nonexistent',
+		}
 	}
 	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
@@ -83,6 +87,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'],
@@ -174,10 +181,6 @@ class roles {
 		include roles::lists
 	}
 
-	if has_role('list_search') {
-		include roles::listsearch
-	}
-
 	if has_role('rtmaster') {
 		include roles::rtmaster
 	}
@@ -225,17 +228,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
 	}
@@ -244,6 +236,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,7 +249,23 @@ class roles {
 	}
 
 	if has_role('gobby_debian_org') {
-		ssl::service { 'gobby.debian.org': notify  => Exec['service apache2 reload'], key => true, tlsaport => [443, 6523], }
+		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') {
@@ -281,14 +293,13 @@ 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
 	}
 
+	if has_role('planet_master') {
+		include roles::planet_master
+	}
 	if has_role('planet_search') {
 		ssl::service { 'planet-search.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
@@ -328,7 +339,7 @@ class roles {
 	}
 
 	if has_role('postgresql_server') {
-		include roles::postgresql_server
+		include postgres::backup_source
 	}
 
 	if has_role('bacula_director') {
@@ -340,4 +351,24 @@ class roles {
 	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
+	}
+
+	if has_role('popcon') {
+		include roles::popcon
+	}
+
+	if has_role('debsources') {
+		include roles::debsources
+	}
+
+	if has_role('ipsec') {
+		include ipsec
+	}
 }