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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 246480716..8ccca492c 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -247,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') {
@@ -317,7 +324,7 @@ class roles {
 	}
 
 	if has_role('postgresql_server') {
-		include roles::postgresql_server
+		include postgres::backup_source
 	}
 
 	if has_role('bacula_director') {
@@ -330,6 +337,10 @@ class roles {
 		include bacula::storage
 	}
 
+	if has_role('salsa.debian.org') {
+		include salsa
+	}
+
 	if $::keyring_debian_org_mirror {
 		include roles::keyring_debian_org_mirror
 	}