5 files changed, 26 insertions, 5 deletions
diff --git a/manifests/ssl/centos.pp b/manifests/ssl/centos.pp
index b2c8ad8..7bc8c89 100644
--- a/manifests/ssl/centos.pp
+++ b/manifests/ssl/centos.pp
@@ -5,4 +5,8 @@ class apache::ssl::centos inherits apache::ssl::base {
         require => Package[apache],
     }
     ::apache::config::global{ 'ssl.conf': }
+
+    apache::config::global{'00-listen-ssl.conf':
+      ensure => absent,
+    }
 }
diff --git a/manifests/ssl/itk.pp b/manifests/ssl/itk.pp
index 62c96cf..5fd3aaf 100644
--- a/manifests/ssl/itk.pp
+++ b/manifests/ssl/itk.pp
@@ -1,7 +1,7 @@
 # manifests/ssl/itk.pp
 
 class apache::ssl::itk inherits apache::ssl {
-    case $operatingsystem {
+    case $::operatingsystem {
         centos: { include apache::ssl::itk::centos }
     }
 }
diff --git a/manifests/ssl/itk_plus.pp b/manifests/ssl/itk_plus.pp
new file mode 100644
index 0000000..0c8e667
--- /dev/null
+++ b/manifests/ssl/itk_plus.pp
@@ -0,0 +1,6 @@
+class apache::ssl::itk_plus inherits apache::ssl::itk {
+    case $::operatingsystem {
+        centos: { include ::apache::ssl::itk_plus::centos }
+        default: { fail("itk plus mode is currently only implemented for CentOS") }
+    }
+}
diff --git a/manifests/ssl/itk_plus/centos.pp b/manifests/ssl/itk_plus/centos.pp
new file mode 100644
index 0000000..00fb472
--- /dev/null
+++ b/manifests/ssl/itk_plus/centos.pp
@@ -0,0 +1,11 @@
+class apache::ssl::itk_plus::centos inherits apache::ssl::centos {
+  include apache::ssl::itk::centos
+  Apache::Config::Global['ssl.conf']{
+    source => "modules/apache/itk_plus/conf.d/${::operatingsystem}/ssl.conf",
+  }
+
+  Apache::Config::Global['00-listen-ssl.conf']{
+    ensure => 'present',
+    content => template("apache/itk_plus/${::operatingsystem}/00-listen-ssl.conf.erb"),
+  }
+}
diff --git a/manifests/ssl/openbsd.pp b/manifests/ssl/openbsd.pp
index 6d357ee..43bc680 100644
--- a/manifests/ssl/openbsd.pp
+++ b/manifests/ssl/openbsd.pp
@@ -1,16 +1,16 @@
 class apache::ssl::openbsd inherits apache::openbsd {
     include apache::ssl::base
 
-    Line['enable_apache_on_boot']{
+    File_line['enable_apache_on_boot']{
         ensure => 'absent',
     }
-    line{'enable_apachessl_on_boot':
-        file => '/etc/rc.conf.local',
+    file_line{'enable_apachessl_on_boot':
+        path => '/etc/rc.conf.local',
         line => 'httpd flags="-DSSL"',
     }
 
     File['/opt/bin/restart_apache.sh']{
-        source => "puppet://$server/modules/apache/scripts/OpenBSD/bin/restart_apache_ssl.sh",
+        source => "puppet:///modules/apache/scripts/OpenBSD/bin/restart_apache_ssl.sh",
     }
     Service['apache']{
         start => 'apachectl startssl',