X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=24821537fda65d330e69610e88d60760ade7183d;hb=40676ab4e5a91665f557f34f944bae430f9b4eb0;hp=f9f14f16f85c5c5ea8ba4bf6d5bff344890216f4;hpb=e6ea8cb86c1454794965ad991da3b620ff720a85;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index f9f14f16f..24821537f 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -71,7 +71,10 @@ 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
@@ -246,13 +249,22 @@ 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',
-			source => 'puppet:///modules/ssl/from-letsencrypt/gobby.debian.org.key',
+			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,
 		}
 	}
 
@@ -285,6 +297,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, }
 	}
@@ -344,4 +359,20 @@ 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
+	}
 }