From 08a5df3e8e1957dbc22e97f80e13861b4865aacd Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 31 Jan 2016 20:12:10 +0100
Subject: [PATCH] try it as a class

---
 modules/apache2/manifests/ssl.pp         | 3 +++
 modules/roles/manifests/debtags.pp       | 2 +-
 modules/roles/manifests/jenkins.pp       | 2 +-
 modules/roles/manifests/static_mirror.pp | 2 +-
 modules/roles/manifests/syncproxy.pp     | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 modules/apache2/manifests/ssl.pp

diff --git a/modules/apache2/manifests/ssl.pp b/modules/apache2/manifests/ssl.pp
new file mode 100644
index 000000000..4bf9d4c90
--- /dev/null
+++ b/modules/apache2/manifests/ssl.pp
@@ -0,0 +1,3 @@
+class apache2::ssl {
+	apache2::module { 'ssl': }
+}
diff --git a/modules/roles/manifests/debtags.pp b/modules/roles/manifests/debtags.pp
index b58cf20ea..50328095f 100644
--- a/modules/roles/manifests/debtags.pp
+++ b/modules/roles/manifests/debtags.pp
@@ -1,5 +1,5 @@
 class roles::debtags {
-	apache2::module { 'ssl': }
+	include apache2::ssl
 	package { 'libapache2-mod-wsgi': ensure => installed, }
 
 	ssl::service { 'debtags.debian.org':
diff --git a/modules/roles/manifests/jenkins.pp b/modules/roles/manifests/jenkins.pp
index afbca199a..1264e8b2c 100644
--- a/modules/roles/manifests/jenkins.pp
+++ b/modules/roles/manifests/jenkins.pp
@@ -1,5 +1,5 @@
 class roles::jenkins {
-	apache2::module { 'ssl': }
+	include apache2::ssl
 	apache2::module { 'proxy_http': }
 
 	apache2::site { '010-jenkins.debian.org':
diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 9faab44bf..fea2e356c 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -6,8 +6,8 @@ class roles::static_mirror {
 	package { 'libapache2-mod-geoip': ensure => installed, }
 	package { 'geoip-database': ensure => installed, }
 
+	include apache2::ssl
 	apache2::module { 'include': }
-	apache2::module { 'ssl': }
 	apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
 
 	file { '/usr/local/bin/static-mirror-run':
diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index b01232b39..eefb8dc56 100644
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -41,6 +41,7 @@ class roles::syncproxy {
 	}
 
 	if $::apache2 and $syncproxy_name != 'unknown' {
+		include apache2::ssl
 		ssl::service { "$syncproxy_name": notify => Service['apache2'], key => true, }
 		apache2::site { '010-syncproxy.debian.org':
 			site   => 'syncproxy.debian.org',
-- 
2.20.1