X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=f930906605632e60f1cc4b881fade8c0321722eb;hb=6635c186c4d7bd82e45d64d686679503b5593764;hp=45ca3a5b4b7c30523fb144da6c08fad96dd9c15a;hpb=acafab70dc47db33070f0c8c1306eee0841339c9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 45ca3a5b4..f93090660 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -45,6 +45,7 @@ class roles {
 		}
 	}
 	if has_role('bugs_master') {
+		ssl::service { 'bugs-devel.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 		ssl::service { 'bugs-master.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
@@ -70,9 +71,6 @@ class roles {
 	if has_role('debian_mirror') {
 		include roles::debian_mirror
 	}
-	if has_role('ftp.d.o') {
-		include roles::ftp
-	}
 	if has_role('ftp_master') {
 		include roles::ftp_master
 		include roles::dakmaster
@@ -99,6 +97,7 @@ class roles {
 		include roles::security_master
 		include roles::dakmaster
 	}
+
 	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
@@ -246,7 +245,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') {
@@ -263,7 +278,7 @@ class roles {
 		include roles::dgit_git
 	}
 
-	if $::hostname in [lw01, lw02, lw03, lw04] {
+	if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
 		include roles::snapshot
 	}
 
@@ -278,6 +293,9 @@ class roles {
 		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, }
 	}
@@ -337,4 +355,28 @@ class roles {
 	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
+	}
+
+	if has_role('debconf_wafer') {
+		include roles::debconf_wafer
+	}
+
+	if has_role('cdbuilder_local_mirror') {
+		include roles::cdbuilder_local_mirror
+	}
+
+	if has_role('alioth_archive') {
+		include roles::alioth_archive
+	}
 }