From 1cf55805ae9d1a9cbc8bd935a52d8eea1914f8d4 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 1 Jul 2013 11:53:32 +0000
Subject: [PATCH] Refresh apache on cert updates

---
 modules/munin/manifests/master.pp | 4 +++-
 modules/roles/manifests/wiki.pp   | 4 +++-
 modules/ssl/manifests/service.pp  | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/munin/manifests/master.pp b/modules/munin/manifests/master.pp
index b8ee54d8..2a01854d 100644
--- a/modules/munin/manifests/master.pp
+++ b/modules/munin/manifests/master.pp
@@ -9,7 +9,9 @@ class munin::master {
 		require => Package['munin'];
 	}
 
-	ssl::service { 'munin.debian.org': }
+	ssl::service { 'munin.debian.org':
+		notify => Service['apache2'],
+	}
 	file { '/etc/munin/munin-conf.d':
 		ensure  => directory,
 		mode    => '0755',
diff --git a/modules/roles/manifests/wiki.pp b/modules/roles/manifests/wiki.pp
index 941a9714..79b5fd3c 100644
--- a/modules/roles/manifests/wiki.pp
+++ b/modules/roles/manifests/wiki.pp
@@ -1,5 +1,7 @@
 class roles::wiki {
-	ssl::service { 'wiki.debian.org': }
+	ssl::service { 'wiki.debian.org':
+		notify => Service['apache2'],
+	}
 	rsync::site { 'wiki':
 		source => 'puppet:///modules/roles/wiki/rsyncd.conf',
 	}
diff --git a/modules/ssl/manifests/service.pp b/modules/ssl/manifests/service.pp
index d562af88..9db3b2b2 100644
--- a/modules/ssl/manifests/service.pp
+++ b/modules/ssl/manifests/service.pp
@@ -1,4 +1,4 @@
-define ssl::service($ensure = present, $tlsaport = 443) {
+define ssl::service($ensure = present, $tlsaport = 443, $notify = []) {
 	$link_target = $ensure ? {
 		present => link,
 		absent  => absent,
@@ -7,7 +7,7 @@ define ssl::service($ensure = present, $tlsaport = 443) {
 
 	file { "/etc/ssl/debian/certs/$name.crt":
 		source => "puppet:///modules/ssl/servicecerts/${name}.crt",
-		notify => Exec['c_rehash /etc/ssl/debian/certs'],
+		notify => [ Exec['c_rehash /etc/ssl/debian/certs'], $notify ],
 	}
 
 	if $tlsaport > 0 {
-- 
2.39.2