X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=5f843acfd0b6c36b8c18a3bf1d072d5ae48ab2bb;hb=43027472aba9b781f311863d36fc8cbdcb882479;hp=ab1f6969301277a99b15bcc7f89b1fd0e9de2384;hpb=c5f18085f190a97daee0c16dbfec78f4e32a96ee;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index ab1f69693..5f843acfd 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -84,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'],
@@ -243,7 +246,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') {
@@ -314,7 +333,7 @@ class roles {
 	}
 
 	if has_role('postgresql_server') {
-		include roles::postgresql_server
+		include postgres::backup_source
 	}
 
 	if has_role('bacula_director') {
@@ -327,7 +346,19 @@ class roles {
 		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
+	}
 }