From: Luca Filipozzi <lfilipoz@emyr.net>
Date: Sun, 12 Jan 2014 11:30:06 +0000 (+0000)
Subject: Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=54d2f1e470aa904f48522aa80555e337799f392e;hp=1517f5e59bda6b8e85df9efad0a52f91afec5e68;p=dsa-puppet.git

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 b2700307..324bb15b 100644
--- 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':