generalized various config styles

finished support for openbsd

1 files changed, 13 insertions, 8 deletions

diff --git a/manifests/ssl.pp b/manifests/ssl.pp
index eeee243..778fbbc 100644
--- a/manifests/ssl.pp
+++ b/manifests/ssl.pp
@@ -9,7 +9,10 @@ class apache::ssl inherits apache {
     }
 }
 
-class apache::ssl::base {}
+class apache::ssl::base {
+    apache::config::file{ 'ssl_defaults.inc': }
+    apache::vhost::file{ '0-default_ssl': }
+}
 
 
 ### distribution specific classes
@@ -22,18 +25,20 @@ class apache::ssl::centos inherits apache::ssl::base {
         require => Package[apache],
     }
     apache::config::file{ 'ssl.conf': }
-    apache::config::file{ 'ssl_defaults.inc': }
-    apache::vhost::file{ '0-default_ssl': }
 }
 
 ### gentoo
-class apache::ssl::gentoo inherits apache::ssl::base {
-    apache::module::file { '00_default_settings': }
-    apache::module::file { '00_error_documents': }
-    apache::vhost::file { '00_default_ssl_vhost': }
-}
+class apache::ssl::gentoo inherits apache::ssl::base {}
 
 class apache::ssl::openbsd inherits apache::openbsd {
+    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",
     }