Merge branch 'develop'

2 files changed, 13 insertions, 0 deletions

diff --git a/puppet/modules/apache b/puppet/modules/apache
deleted file mode 160000
-Subproject 117bed9a9263c21d253d86b667eb165948efdc2
diff --git a/puppet/modules/apache/manifests/ssl.pp b/puppet/modules/apache/manifests/ssl.pp
new file mode 100644
index 00000000..bfef7adc
--- /dev/null
+++ b/puppet/modules/apache/manifests/ssl.pp
@@ -0,0 +1,13 @@
+# manifests/ssl.pp
+
+class apache::ssl {
+  case $::operatingsystem {
+    centos: { include apache::ssl::centos }
+    openbsd: { include apache::ssl::openbsd }
+    debian: { include apache::ssl::debian }
+    defaults: { include apache::ssl::base }
+  }
+  if $apache::manage_shorewall {
+    include shorewall::rules::https
+  }
+}