From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 6 Aug 2016 17:43:19 +0000 (+0200)
Subject: reload apache instead of restarting it
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=8e104735c829bddd66c9f0aacfa0f41e92eed57d

reload apache instead of restarting it
---

diff --git a/modules/apache2/manifests/config.pp b/modules/apache2/manifests/config.pp
index 4faa33f15..d185e4239 100644
--- a/modules/apache2/manifests/config.pp
+++ b/modules/apache2/manifests/config.pp
@@ -22,14 +22,14 @@ define apache2::config (
 				ensure  => $ensure,
 				content => $content,
 				require => Package['apache2'],
-				notify  => Service['apache2'],
+				notify  => Exec['service apache2 reload'],
 			}
 		} else {
 			file { "/etc/apache2/conf.d/${name}":
 				ensure  => $ensure,
 				source  => $source,
 				require => Package['apache2'],
-				notify  => Service['apache2'],
+				notify  => Exec['service apache2 reload'],
 			}
 		}
 	} else {
@@ -38,14 +38,14 @@ define apache2::config (
 				ensure  => $ensure,
 				content => $content,
 				require => Package['apache2'],
-				notify  => Service['apache2'],
+				notify  => Exec['service apache2 reload'],
 			}
 		} else {
 			file { "/etc/apache2/conf-available/${name}.conf":
 				ensure  => $ensure,
 				source  => $source,
 				require => Package['apache2'],
-				notify  => Service['apache2'],
+				notify  => Exec['service apache2 reload'],
 			}
 		}
 
@@ -57,7 +57,7 @@ define apache2::config (
 		file { "/etc/apache2/conf-enabled/${name}.conf":
 			ensure => $link_ensure,
 			target => "../conf-available/${name}.conf",
-			notify => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
 		}
 	}
 }
diff --git a/modules/apache2/manifests/site.pp b/modules/apache2/manifests/site.pp
index 46ec1bf75..2a7257ba7 100644
--- a/modules/apache2/manifests/site.pp
+++ b/modules/apache2/manifests/site.pp
@@ -35,14 +35,14 @@ define apache2::site (
 			ensure  => $ensure,
 			content => $content,
 			require => Package['apache2'],
-			notify  => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
 		}
 	} else {
 		file { $target:
 			ensure  => $ensure,
 			source  => $source,
 			require => Package['apache2'],
-			notify  => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
 		}
 	}
 
@@ -53,7 +53,7 @@ define apache2::site (
 
 		file { "/etc/apache2/sites-enabled/${name}":
 			ensure => absent,
-			notify => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
 		}
 	}
 
@@ -61,12 +61,12 @@ define apache2::site (
 		file { $symlink:
 			ensure => link,
 			target => $link_target,
-			notify => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
 		}
 	} else {
 		file { $symlink:
 			ensure => absent,
-			notify => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
 		}
 	}
 }
diff --git a/modules/munin/manifests/master.pp b/modules/munin/manifests/master.pp
index ca221b8e4..5dc0bbc68 100644
--- a/modules/munin/manifests/master.pp
+++ b/modules/munin/manifests/master.pp
@@ -10,7 +10,7 @@ class munin::master {
 	}
 
 	ssl::service { 'munin.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 	}
 	file { '/etc/munin/munin-conf.d':
 		ensure  => directory,
diff --git a/modules/roles/manifests/buildd_master.pp b/modules/roles/manifests/buildd_master.pp
index 03d06f8e5..63570efdc 100644
--- a/modules/roles/manifests/buildd_master.pp
+++ b/modules/roles/manifests/buildd_master.pp
@@ -1,6 +1,6 @@
 class roles::buildd_master {
 	ssl::service { 'buildd.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 	}
 
 	file { '/etc/ssh/userkeys/wb-buildd.more':
diff --git a/modules/roles/manifests/contributors.pp b/modules/roles/manifests/contributors.pp
index 54863e23c..d0ed1fb79 100644
--- a/modules/roles/manifests/contributors.pp
+++ b/modules/roles/manifests/contributors.pp
@@ -1,5 +1,5 @@
 class roles::contributors {
 	ssl::service { 'contributors.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 	}
 }
diff --git a/modules/roles/manifests/dbmaster.pp b/modules/roles/manifests/dbmaster.pp
index 111b4f143..56b7433fb 100644
--- a/modules/roles/manifests/dbmaster.pp
+++ b/modules/roles/manifests/dbmaster.pp
@@ -13,7 +13,7 @@ class roles::dbmaster {
 	$rabbit_password = $roles::pubsub::parameters::rabbit_password
 
 	ssl::service { 'db.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 	}
 
 	roles::pubsub::config { 'generate':
diff --git a/modules/roles/manifests/debtags.pp b/modules/roles/manifests/debtags.pp
index 50328095f..b11e75710 100644
--- a/modules/roles/manifests/debtags.pp
+++ b/modules/roles/manifests/debtags.pp
@@ -3,7 +3,7 @@ class roles::debtags {
 	package { 'libapache2-mod-wsgi': ensure => installed, }
 
 	ssl::service { 'debtags.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 		key => true,
 	}
 
diff --git a/modules/roles/manifests/dgit_browse.pp b/modules/roles/manifests/dgit_browse.pp
index 0d2ea14ea..72ceebd37 100644
--- a/modules/roles/manifests/dgit_browse.pp
+++ b/modules/roles/manifests/dgit_browse.pp
@@ -1,6 +1,6 @@
 class roles::dgit_browse {
 	ssl::service { 'browse.dgit.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 		key => true,
 	}
 
@@ -13,7 +13,7 @@ class roles::dgit_browse {
 	}
 	file { '/etc/apache2/conf-enabled/cgit.conf':
 		ensure => absent,
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 	}
 
 	apache2::site { '010-browse.dgit.debian.org':
diff --git a/modules/roles/manifests/dgit_git.pp b/modules/roles/manifests/dgit_git.pp
index be5b05c65..866d8cbd4 100644
--- a/modules/roles/manifests/dgit_git.pp
+++ b/modules/roles/manifests/dgit_git.pp
@@ -1,6 +1,6 @@
 class roles::dgit_git {
 	ssl::service { 'git.dgit.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 		key => true,
 	}
 
diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp
index 5f04386b7..a76e06819 100644
--- a/modules/roles/manifests/ftp_master.pp
+++ b/modules/roles/manifests/ftp_master.pp
@@ -6,6 +6,6 @@ class roles::ftp_master {
 	}
 
 	ssl::service { 'ftp-master.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 	}
 }
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index e11d1aee5..be8f3ab45 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -19,7 +19,7 @@ class roles {
 	if has_role('nagiosmaster') {
 	#	include nagios::server
 		ssl::service { 'nagios.debian.org':
-			notify => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
 		}
 	}
 
@@ -43,11 +43,11 @@ class roles {
 
 	if has_role('bugs_base') {
 		ssl::service { 'bugs.debian.org':
-			notify => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
 		}
 	}
 	if has_role('bugs_master') {
-		ssl::service { 'bugs-master.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'bugs-master.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('ftp_master') {
@@ -57,12 +57,12 @@ class roles {
 
 	if has_role('api.ftp-master') {
 		ssl::service { 'api.ftp-master.debian.org':
-			notify => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
 		}
 	}
 
 	if has_role('manpages') {
-		ssl::service { 'manpages.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'manpages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('security_mirror') {
@@ -89,7 +89,7 @@ class roles {
 	}
 
 	if has_role('people') {
-		ssl::service { 'people.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'people.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 		onion::service { 'people.debian.org': port => 80, target_address => 'people.debian.org', target_port => 80, }
 	}
 
@@ -103,7 +103,7 @@ class roles {
 	}
 
 	if has_role('cgi.d.o') {
-		ssl::service { 'cgi.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'cgi.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('keyring') {
@@ -232,19 +232,19 @@ class roles {
 	}
 
 	if has_role('packages') {
-		ssl::service { 'packages.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('qamaster') {
-		ssl::service { 'qa.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('packagesqamaster') {
-		ssl::service { 'packages.qa.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'packages.qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('gobby_debian_org') {
-		ssl::service { 'gobby.debian.org': notify => Service['apache2'], key => true, tlsaport => [443, 6523], }
+		ssl::service { 'gobby.debian.org': notify  => Exec['service apache2 reload'], key => true, tlsaport => [443, 6523], }
 	}
 
 	if has_role('search_backend') {
@@ -266,7 +266,7 @@ class roles {
 	}
 
 	if has_role('veyepar.debian.org') {
-		ssl::service { 'veyepar.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'veyepar.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('httpredir') {
@@ -278,24 +278,24 @@ class roles {
 	}
 
 	if has_role('planet_search') {
-		ssl::service { 'planet-search.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'planet-search.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('i18n.d.o') {
-		ssl::service { 'i18n.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'i18n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('l10n.d.o') {
-		ssl::service { 'l10n.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'l10n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('dedup.d.n') {
-		ssl::service { 'dedup.debian.net': notify => Service['apache2'], key => true, }
+		ssl::service { 'dedup.debian.net': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('pet.d.n') {
-		ssl::service { 'pet.debian.net': notify => Service['apache2'], key => true, }
-		ssl::service { 'pet-devel.debian.net': notify => Service['apache2'], key => true, }
+		ssl::service { 'pet.debian.net': notify  => Exec['service apache2 reload'], key => true, }
+		ssl::service { 'pet-devel.debian.net': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('ports-master') {
diff --git a/modules/roles/manifests/jenkins.pp b/modules/roles/manifests/jenkins.pp
index 1264e8b2c..e2374bc85 100644
--- a/modules/roles/manifests/jenkins.pp
+++ b/modules/roles/manifests/jenkins.pp
@@ -8,6 +8,6 @@ class roles::jenkins {
 	}
 
 	ssl::service { 'jenkins.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 	}
 }
diff --git a/modules/roles/manifests/keyring.pp b/modules/roles/manifests/keyring.pp
index eb331e04a..379fae21c 100644
--- a/modules/roles/manifests/keyring.pp
+++ b/modules/roles/manifests/keyring.pp
@@ -4,7 +4,7 @@ class roles::keyring {
 	}
 
 	ssl::service { 'keyring.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 		key => true,
 	}
 }
diff --git a/modules/roles/manifests/lists.pp b/modules/roles/manifests/lists.pp
index d501244ae..ace2b25cc 100644
--- a/modules/roles/manifests/lists.pp
+++ b/modules/roles/manifests/lists.pp
@@ -1,6 +1,6 @@
 class roles::lists {
 	ssl::service { 'lists.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 	}
 
 	dnsextras::tlsa_record{ 'tlsa-mailport':
diff --git a/modules/roles/manifests/nm.pp b/modules/roles/manifests/nm.pp
index 4cdc3b379..f792de4cd 100644
--- a/modules/roles/manifests/nm.pp
+++ b/modules/roles/manifests/nm.pp
@@ -1,5 +1,5 @@
 class roles::nm {
 	ssl::service { 'nm.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 	}
 }
diff --git a/modules/roles/manifests/piuparts.pp b/modules/roles/manifests/piuparts.pp
index fbd69ef7a..5dfd1ebb0 100644
--- a/modules/roles/manifests/piuparts.pp
+++ b/modules/roles/manifests/piuparts.pp
@@ -1,6 +1,6 @@
 class roles::piuparts {
 	ssl::service { 'piuparts.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 		key => true,
 	}
 }
diff --git a/modules/roles/manifests/release.pp b/modules/roles/manifests/release.pp
index 084e80bac..cc9e668e2 100644
--- a/modules/roles/manifests/release.pp
+++ b/modules/roles/manifests/release.pp
@@ -1,5 +1,5 @@
 class roles::release {
 	ssl::service { 'release.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 	}
 }
diff --git a/modules/roles/manifests/rtmaster.pp b/modules/roles/manifests/rtmaster.pp
index b1c74870a..c6dfbbe2f 100644
--- a/modules/roles/manifests/rtmaster.pp
+++ b/modules/roles/manifests/rtmaster.pp
@@ -1,5 +1,5 @@
 class roles::rtmaster {
 	ssl::service { 'rt.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 	}
 }
diff --git a/modules/roles/manifests/search_frontend.pp b/modules/roles/manifests/search_frontend.pp
index 4d66c1d45..dc1861db5 100644
--- a/modules/roles/manifests/search_frontend.pp
+++ b/modules/roles/manifests/search_frontend.pp
@@ -1,6 +1,6 @@
 class roles::search_frontend {
 	ssl::service { 'search.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 		key => true,
 	}
 }
diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index ae3c471f0..a96dbec50 100644
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -1,7 +1,7 @@
 class roles::security_master {
 
 	ssl::service { 'security-master.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 		key => true,
 	}
 
diff --git a/modules/roles/manifests/security_tracker.pp b/modules/roles/manifests/security_tracker.pp
index 1210c7ef6..abc096021 100644
--- a/modules/roles/manifests/security_tracker.pp
+++ b/modules/roles/manifests/security_tracker.pp
@@ -1,5 +1,5 @@
 class roles::security_tracker {
 	ssl::service { 'security-tracker.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 	}
 }
diff --git a/modules/roles/manifests/sso.pp b/modules/roles/manifests/sso.pp
index 890a0baf9..407599308 100644
--- a/modules/roles/manifests/sso.pp
+++ b/modules/roles/manifests/sso.pp
@@ -1,5 +1,5 @@
 class roles::sso {
 	ssl::service { 'sso.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 	}
 }
diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 53b7b8a0d..178d59c0e 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -78,40 +78,40 @@ class roles::static_mirror {
 		content => template('roles/apache-www.debian.org.erb'),
 	}
 
-	ssl::service { 'dsa.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], }
-	ssl::service { 'www.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], }
-	ssl::service { 'rtc.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], }
-	ssl::service { 'd-i.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], }
+	ssl::service { 'dsa.debian.org'      : ensure => "ifstatic", notify  => Exec['service apache2 reload'], }
+	ssl::service { 'www.debian.org'      : ensure => "ifstatic", notify  => Exec['service apache2 reload'], }
+	ssl::service { 'rtc.debian.org'      : ensure => "ifstatic", notify  => Exec['service apache2 reload'], }
+	ssl::service { 'd-i.debian.org'      : ensure => "ifstatic", notify  => Exec['service apache2 reload'], }
 
 	# do
-	ssl::service { 'appstream.debian.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'backports.debian.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'bits.debian.org'               : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'blends.debian.org'             : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'lintian.debian.org'            : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'onion.debian.org'              : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'release.debian.org'            : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'security-team.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'www.ports.debian.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'appstream.debian.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'backports.debian.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'bits.debian.org'               : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'blends.debian.org'             : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'lintian.debian.org'            : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'onion.debian.org'              : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'release.debian.org'            : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'security-team.debian.org'      : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'www.ports.debian.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	# dn
-	ssl::service { 'news.debian.net'               : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'micronews.debian.net'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'debaday.debian.net'            : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'timeline.debian.net'           : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'wnpp-by-tags.debian.net'       : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'news.debian.net'               : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'micronews.debian.net'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'debaday.debian.net'            : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'timeline.debian.net'           : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'wnpp-by-tags.debian.net'       : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	# dc
-	ssl::service { 'debconf0.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'debconf1.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'debconf2.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'debconf3.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'debconf4.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'debconf5.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'debconf6.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'debconf7.debconf.org'          : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { '10years.debconf.org'           : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'es.debconf.org'                : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'fr.debconf.org'                : ensure => "ifstatic", notify => Service['apache2'], key => true, }
-	ssl::service { 'miniconf10.debconf.org'        : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'debconf0.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'debconf1.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'debconf2.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'debconf3.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'debconf4.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'debconf5.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'debconf6.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'debconf7.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { '10years.debconf.org'           : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'es.debconf.org'                : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'fr.debconf.org'                : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'miniconf10.debconf.org'        : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 
 	if has_role('static_mirror_onion') {
 		if ! $onion_v4_addr {
diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index 202cabda0..3101025d1 100644
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -37,7 +37,7 @@ class roles::syncproxy {
 	if $::apache2 and $syncproxy_name != 'unknown' {
 		include apache2::ssl
 		ssl::service { "$syncproxy_name":
-			notify => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
 			key => true,
 		}
 		apache2::site { '010-syncproxy.debian.org':
diff --git a/modules/roles/manifests/tracker.pp b/modules/roles/manifests/tracker.pp
index 23d95d506..d9bce2da2 100644
--- a/modules/roles/manifests/tracker.pp
+++ b/modules/roles/manifests/tracker.pp
@@ -1,6 +1,6 @@
 class roles::tracker {
 	ssl::service { 'tracker.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 		key => true,
 	}
 }
diff --git a/modules/roles/manifests/udd.pp b/modules/roles/manifests/udd.pp
index 73fc80464..fe9abbae1 100644
--- a/modules/roles/manifests/udd.pp
+++ b/modules/roles/manifests/udd.pp
@@ -1,5 +1,5 @@
 class roles::udd {
 	ssl::service { 'udd.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 	}
 }
diff --git a/modules/roles/manifests/vote.pp b/modules/roles/manifests/vote.pp
index a2147032f..88e3920af 100644
--- a/modules/roles/manifests/vote.pp
+++ b/modules/roles/manifests/vote.pp
@@ -1,5 +1,5 @@
 class roles::vote {
 	ssl::service { 'vote.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 	}
 }
diff --git a/modules/roles/manifests/wiki.pp b/modules/roles/manifests/wiki.pp
index b5939dc37..b6fb7e866 100644
--- a/modules/roles/manifests/wiki.pp
+++ b/modules/roles/manifests/wiki.pp
@@ -1,6 +1,6 @@
 class roles::wiki {
 	ssl::service { 'wiki.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 		key => true,
 	}
 	rsync::site { 'wiki':
diff --git a/modules/roles/manifests/www_master.pp b/modules/roles/manifests/www_master.pp
index 57e52ef8c..aabe5f23e 100644
--- a/modules/roles/manifests/www_master.pp
+++ b/modules/roles/manifests/www_master.pp
@@ -1,6 +1,6 @@
 class roles::www_master {
 	ssl::service { 'www-master.debian.org':
-		notify => Service['apache2'],
+		notify  => Exec['service apache2 reload'],
 		key => true,
 	}
 }