extracted every define and class in it's own file

5 files changed, 36 insertions, 6 deletions

diff --git a/manifests/ssl/base.pp b/manifests/ssl/base.pp
new file mode 100644
index 0000000..72f61fd
--- /dev/null
+++ b/manifests/ssl/base.pp
@@ -0,0 +1,4 @@
+class apache::ssl::base {
+    ::apache::config::file{ 'ssl_defaults.inc': }
+    ::apache::vhost::file{ '0-default_ssl': }
+}
diff --git a/manifests/ssl/centos.pp b/manifests/ssl/centos.pp
new file mode 100644
index 0000000..a516f02
--- /dev/null
+++ b/manifests/ssl/centos.pp
@@ -0,0 +1,8 @@
+class apache::ssl::centos inherits apache::ssl::base {
+    package { 'mod_ssl':
+        name => 'mod_ssl',
+        ensure => present,
+        require => Package[apache],
+    }
+    ::apache::config::file{ 'ssl.conf': }
+}
diff --git a/manifests/ssl/itk.pp b/manifests/ssl/itk.pp
index 910a48d..62c96cf 100644
--- a/manifests/ssl/itk.pp
+++ b/manifests/ssl/itk.pp
@@ -6,9 +6,3 @@ class apache::ssl::itk inherits apache::ssl {
     }
 }
 
-class apache::ssl::itk::centos inherits apache::ssl::centos {
-    Package['mod_ssl']{
-        name => 'mod_ssl-itk',
-    }
-}
-
diff --git a/manifests/ssl/itk/centos.pp b/manifests/ssl/itk/centos.pp
new file mode 100644
index 0000000..fb6a4a6
--- /dev/null
+++ b/manifests/ssl/itk/centos.pp
@@ -0,0 +1,6 @@
+class apache::ssl::itk::centos inherits apache::ssl::centos {
+    Package['mod_ssl']{
+        name => 'mod_ssl-itk',
+    }
+}
+
diff --git a/manifests/ssl/openbsd.pp b/manifests/ssl/openbsd.pp
new file mode 100644
index 0000000..04dadeb
--- /dev/null
+++ b/manifests/ssl/openbsd.pp
@@ -0,0 +1,18 @@
+class apache::ssl::openbsd inherits apache::openbsd {
+    include apache::ssl::base
+
+    Line['enable_apache_on_boot']{
+        ensure => 'absent',
+    }
+    line{'enable_apachessl_on_boot':
+        file => '/etc/rc.conf.local',
+        line => 'httpd flags="-DSSL"',
+    }
+
+    File['/opt/bin/restart_apache.sh']{
+        source => "puppet://$server/apache/OpenBSD/bin/restart_apache_ssl.sh",
+    }
+    Service['apache']{
+        start => 'apachectl startssl',
+    }
+}