X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=8ccca492ccb52c71f2f165183ab97811a70044f6;hb=155efbd68fa7f26852f430cbe6a50528c45c820e;hp=dec4470a825053c9bc8f9635e8240731ddb1ea54;hpb=87423ba664cd5f2bb462ebadd08b1a90d0fe1c8d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index dec4470a8..8ccca492c 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'],
@@ -244,6 +247,13 @@ class roles {
 
 	if has_role('gobby_debian_org') {
 		ssl::service { 'gobby.debian.org': notify  => Exec['service apache2 reload'], 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,
+		}
 	}
 
 	if has_role('search_backend') {
@@ -314,7 +324,7 @@ class roles {
 	}
 
 	if has_role('postgresql_server') {
-		include roles::postgresql_server
+		include postgres::backup_source
 	}
 
 	if has_role('bacula_director') {
@@ -326,4 +336,12 @@ 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
+	}
 }