From: Luca Filipozzi <lfilipoz@emyr.net>
Date: Sun, 12 Jan 2014 09:50:46 +0000 (+0000)
Subject: Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5073d030cdafeabd6ac44a4ba571811b806140d2;hp=c755bd3c93539c76169d2545918cb9739d97814c;p=mirror%2Fdsa-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 b9514d3ad..b2700307c 100644
--- a/modules/roles/manifests/sip.pp
+++ b/modules/roles/manifests/sip.pp
@@ -1,22 +1,23 @@
 class roles::sip {
-	#include concat::setup
+	include concat::setup
 
 	ssl::service { 'www.debian.org':
+		# TODO notify concat
 	}
 
-	#concat { '/etc/ssl/debian/certs/www.debian.org-chained.crt':
-	#	ensure      => present,
-	#}
-	#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,
-	#}
-	#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,
-	#}
+	# 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,
+	}
+	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,
+	}
 
 	@ferm::rule { 'dsa-sip-ws-ip4':
 		domain      => 'ip',