Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet

diff --git a/modules/roles/manifests/sip.pp b/modules/roles/manifests/sip.pp
index b2700307ce055864477a5d12eb808f5a637ce1f6..324bb15baf32dd92990dde8542679a55bfefe3d4 100644 (file)
--- a/modules/roles/manifests/sip.pp
+++ b/modules/roles/manifests/sip.pp
@@ -2,21 +2,21 @@ class roles::sip {
        include concat::setup
 
        ssl::service { 'www.debian.org':
-               # TODO notify concat
        }
 
-       # TODO concatate in the ssl module?
        concat { '/etc/ssl/debian/certs/www.debian.org-chained.crt':
        }
        concat::fragment { '/etc/ssl/debian/certs/www.debian.org.crt':
                target      => '/etc/ssl/debian/certs/www.debian.org-chained.crt',
                source      => 'file:///etc/ssl/debian/certs/www.debian.org.crt',
                order       => 00,
+               require     => File['/etc/ssl/debian/certs/www.debian.org.crt']
        }
        concat::fragment { '/etc/ssl/debian/certs/www.debian.org.crt-chain':
                target      => '/etc/ssl/debian/certs/www.debian.org-chained.crt',
                source      => 'file:///etc/ssl/debian/certs/www.debian.org.crt-chain',
                order       => 99,
+               require     => File['/etc/ssl/debian/certs/www.debian.org.crt-chain']
        }
 
        @ferm::rule { 'dsa-sip-ws-ip4':