Refresh apache on cert updates

diff --git a/modules/munin/manifests/master.pp b/modules/munin/manifests/master.pp
index b8ee54d86f79a5143e4cbb3a60d85c3827f8860d..2a01854d17da767f4f83839b0b5519552efa9c59 100644 (file)
--- 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 941a971485b0f16d7deecbb760003d53c6dd7572..79b5fd3c950989450c0eec437c84ed4c10a86871 100644 (file)
--- 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 d562af88580b41f2bc78dfce8762ee6a7f04670d..9db3b2b2f60855ba105f2abb417d9c15b962f1f5 100644 (file)
--- 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 {