From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 5 Nov 2015 18:45:46 +0000 (+0100)
Subject: No need to make /etc/repro/www.debian.org-chained.crt and /etc/repro/sip-ws.debian... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7979d10744f00844e4dcaaefe1a4fa5debf57b3e;p=mirror%2Fdsa-puppet.git

No need to make /etc/repro/debian.org-chained.crt and /etc/repro/sip-ws.debian.org-chained.crt when they exist in /etc/ssl/debian/certs
---

diff --git a/modules/roles/manifests/rtc.pp b/modules/roles/manifests/rtc.pp
index ceef3ce99..754367043 100644
--- a/modules/roles/manifests/rtc.pp
+++ b/modules/roles/manifests/rtc.pp
@@ -6,36 +6,6 @@ class roles::rtc {
 	ssl::service { 'sip-ws.debian.org':
 	}
 
-	concat { '/etc/repro/www.debian.org-chained.crt':
-	}
-	concat::fragment { '/etc/ssl/debian/certs/www.debian.org.crt':
-		target      => '/etc/repro/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/repro/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'],
-	}
-
-	concat { '/etc/repro/sip-ws.debian.org-chained.crt':
-	}
-	concat::fragment { '/etc/ssl/debian/certs/sip-ws.debian.org.crt':
-		target      => '/etc/repro/sip-ws.debian.org-chained.crt',
-		source      => 'file:///etc/ssl/debian/certs/sip-ws.debian.org.crt',
-		order       => 00,
-		require     => File['/etc/ssl/debian/certs/sip-ws.debian.org.crt'],
-	}
-	concat::fragment { '/etc/ssl/debian/certs/sip-ws.debian.org.crt-chain':
-		target      => '/etc/repro/sip-ws.debian.org-chained.crt',
-		source      => 'file:///etc/ssl/debian/certs/sip-ws.debian.org.crt-chain',
-		order       => 99,
-		require     => File['/etc/ssl/debian/certs/sip-ws.debian.org.crt-chain'],
-	}
-
 	@ferm::rule { 'dsa-xmpp-client-ip4':
 		domain      => 'ip',
 		description => 'XMPP connections (client to server)',