From 856320396d2488b41a6db2edd34876e14a9e4564 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 25 Aug 2013 11:46:50 +0200
Subject: [PATCH] Move -chains to a different dir on the puppet server

---
 modules/ssl/files/{servicecerts => chains}/DEBIAN-CA            | 0
 modules/ssl/files/{servicecerts => chains}/GANDI-CA             | 0
 .../ftp-master.debian.org.crt}                                  | 0
 .../munin.debian.org.crt-chain => chains/munin.debian.org.crt}  | 0
 .../piuparts.debian.org.crt}                                    | 0
 .../security-tracker.debian.org.crt}                            | 0
 .../wiki.debian.org.crt-chain => chains/wiki.debian.org.crt}    | 0
 modules/ssl/manifests/service.pp                                | 2 +-
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename modules/ssl/files/{servicecerts => chains}/DEBIAN-CA (100%)
 rename modules/ssl/files/{servicecerts => chains}/GANDI-CA (100%)
 rename modules/ssl/files/{servicecerts/ftp-master.debian.org.crt-chain => chains/ftp-master.debian.org.crt} (100%)
 rename modules/ssl/files/{servicecerts/munin.debian.org.crt-chain => chains/munin.debian.org.crt} (100%)
 rename modules/ssl/files/{servicecerts/piuparts.debian.org.crt-chain => chains/piuparts.debian.org.crt} (100%)
 rename modules/ssl/files/{servicecerts/security-tracker.debian.org.crt-chain => chains/security-tracker.debian.org.crt} (100%)
 rename modules/ssl/files/{servicecerts/wiki.debian.org.crt-chain => chains/wiki.debian.org.crt} (100%)

diff --git a/modules/ssl/files/servicecerts/DEBIAN-CA b/modules/ssl/files/chains/DEBIAN-CA
similarity index 100%
rename from modules/ssl/files/servicecerts/DEBIAN-CA
rename to modules/ssl/files/chains/DEBIAN-CA
diff --git a/modules/ssl/files/servicecerts/GANDI-CA b/modules/ssl/files/chains/GANDI-CA
similarity index 100%
rename from modules/ssl/files/servicecerts/GANDI-CA
rename to modules/ssl/files/chains/GANDI-CA
diff --git a/modules/ssl/files/servicecerts/ftp-master.debian.org.crt-chain b/modules/ssl/files/chains/ftp-master.debian.org.crt
similarity index 100%
rename from modules/ssl/files/servicecerts/ftp-master.debian.org.crt-chain
rename to modules/ssl/files/chains/ftp-master.debian.org.crt
diff --git a/modules/ssl/files/servicecerts/munin.debian.org.crt-chain b/modules/ssl/files/chains/munin.debian.org.crt
similarity index 100%
rename from modules/ssl/files/servicecerts/munin.debian.org.crt-chain
rename to modules/ssl/files/chains/munin.debian.org.crt
diff --git a/modules/ssl/files/servicecerts/piuparts.debian.org.crt-chain b/modules/ssl/files/chains/piuparts.debian.org.crt
similarity index 100%
rename from modules/ssl/files/servicecerts/piuparts.debian.org.crt-chain
rename to modules/ssl/files/chains/piuparts.debian.org.crt
diff --git a/modules/ssl/files/servicecerts/security-tracker.debian.org.crt-chain b/modules/ssl/files/chains/security-tracker.debian.org.crt
similarity index 100%
rename from modules/ssl/files/servicecerts/security-tracker.debian.org.crt-chain
rename to modules/ssl/files/chains/security-tracker.debian.org.crt
diff --git a/modules/ssl/files/servicecerts/wiki.debian.org.crt-chain b/modules/ssl/files/chains/wiki.debian.org.crt
similarity index 100%
rename from modules/ssl/files/servicecerts/wiki.debian.org.crt-chain
rename to modules/ssl/files/chains/wiki.debian.org.crt
diff --git a/modules/ssl/manifests/service.pp b/modules/ssl/manifests/service.pp
index 8e3d46f08..7b8921cea 100644
--- a/modules/ssl/manifests/service.pp
+++ b/modules/ssl/manifests/service.pp
@@ -10,7 +10,7 @@ define ssl::service($ensure = present, $tlsaport = 443, $notify = []) {
 		notify => [ Exec['c_rehash /etc/ssl/debian/certs'], $notify ],
 	}
 	file { "/etc/ssl/debian/certs/$name.crt-chain":
-		source => [ "puppet:///modules/ssl/servicecerts/${name}.crt-chain", "puppet:///modules/ssl/servicecerts/${name}.crt" ],
+		source => [ "puppet:///modules/ssl/chains/${name}.crt", "puppet:///modules/ssl/servicecerts/${name}.crt" ],
 		notify => [ Exec['c_rehash /etc/ssl/debian/certs'], $notify ],
 		links => follow,
 	}
-- 
2.20.1