From 0b68381fd31eec6f60601df29d4cf0b137724fad Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 4 Feb 2016 09:00:39 +0100
Subject: [PATCH] Add certs for www-master and cgi.d.o

---
 hieradata/common.yaml                 |  2 ++
 modules/roles/manifests/init.pp       |  7 +++++++
 modules/roles/manifests/syncproxy.pp  |  5 ++++-
 modules/roles/manifests/www_master.pp | 11 +++++++----
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 36e328e70..42e7d2bea 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -166,6 +166,8 @@ roles:
     - wilder.debian.org
   www_master:
     - wolkenstein.debian.org
+  cgi.d.o:
+    - wolkenstein.debian.org
   postgres_backup_server:
     - backuphost.debian.org
     - storace.debian.org
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 125f7630a..c436bacd7 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -104,6 +104,13 @@ class roles {
 		include roles::www_master
 	}
 
+	if has_role('cgi.d.o') {
+		ssl::service { 'cgi.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
 	if has_role('keyring') {
 		include roles::keyring
 	}
diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index ea9e24e78..86ba67cc8 100644
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -36,7 +36,10 @@ class roles::syncproxy {
 
 	if $::apache2 and $syncproxy_name != 'unknown' {
 		include apache2::ssl
-		ssl::service { "$syncproxy_name": notify => Service['apache2'], key => true, }
+		ssl::service {
+			"$syncproxy_name": notify => Service['apache2'],
+			key => true,
+		}
 		apache2::site { '010-syncproxy.debian.org':
 			site   => 'syncproxy.debian.org',
 			content => template('roles/syncproxy/syncproxy.debian.org-apache.erb')
diff --git a/modules/roles/manifests/www_master.pp b/modules/roles/manifests/www_master.pp
index 856721ce2..70fc5591c 100644
--- a/modules/roles/manifests/www_master.pp
+++ b/modules/roles/manifests/www_master.pp
@@ -1,6 +1,9 @@
 class roles::www_master {
-		rsync::site { 'www_master':
-			source => 'puppet:///modules/roles/www_master/rsyncd.conf',
-		}
-
+	rsync::site { 'www_master':
+		source => 'puppet:///modules/roles/www_master/rsyncd.conf',
+	}
+	ssl::service { 'www-master.debian.org':
+		notify => Service['apache2'],
+		key => true,
+	}
 }
-- 
2.20.1