fix various missing things for itk_plus mode

5 files changed, 45 insertions, 3 deletions

diff --git a/manifests/centos/itk_plus.pp b/manifests/centos/itk_plus.pp
index f73be04..0bdb744 100644
--- a/manifests/centos/itk_plus.pp
+++ b/manifests/centos/itk_plus.pp
@@ -5,7 +5,7 @@ class apache::centos::itk_plus inherits apache::centos::itk {
   }
 
   Apache::Config::Global['00-listen.conf']{
-    ensure => present,
+    ensure => 'present',
     content => template("apache/itk_plus/${operatingsystem}/00-listen.conf.erb"),
   }
 
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_plus/centos.pp b/manifests/ssl/itk_plus/centos.pp
new file mode 100644
index 0000000..d8989c9
--- /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 => "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/vhost/file.pp b/manifests/vhost/file.pp
index a471359..0c01b34 100644
--- a/manifests/vhost/file.pp
+++ b/manifests/vhost/file.pp
@@ -7,6 +7,12 @@
 #   - absent: standardpath (default)
 #   - else: path to deploy
 #
+# ssl_mode: wether this vhost supports ssl or not
+#   - false: don't enable ssl for this vhost (default)
+#   - true: enable ssl for this vhost
+#   - force: enable ssl and redirect non-ssl to ssl
+#   - only: enable ssl only
+#
 # run_mode: controls in which mode the vhost should be run, there are different setups
 #           possible:
 #   - normal: (*default*) run vhost with the current active worker (default: prefork) don't
@@ -32,6 +38,7 @@ define apache::vhost::file(
     $content = 'absent',
     $do_includes = false,
     $run_mode = 'normal',
+    $ssl_mode = false,
     $mod_security = false,
     $htpasswd_file = 'absent',
     $htpasswd_path = 'absent',
@@ -46,8 +53,26 @@ define apache::vhost::file(
     }
 
     case $run_mode {
-      'itk': { include ::apache::itk::lock }
-      'proxy-itk','static-itk': { include ::apache::itk_plus::lock }
+      'itk': {
+        include ::apache::itk
+        include ::apache::itk::lock
+        if $ssl_mode {
+          include ::apache::ssl::itk
+        }
+      ]
+      'proxy-itk','static-itk': {
+        include ::apache::itk_plus
+        include ::apache::itk_plus::lock
+        if $ssl_mode {
+          include ::apache::ssl::itk_plus
+        }
+      }
+      default: {
+        include ::apache
+        if $ssl_mode {
+          include ::apache::ssl
+        }
+      }
     }
     $vhosts_dir = $operatingsystem ? {
         centos => "$apache::centos::config_dir/vhosts.d",
diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp
index 36aa0cd..b4c2562 100644
--- a/manifests/vhost/template.pp
+++ b/manifests/vhost/template.pp
@@ -14,6 +14,7 @@
 #   - true: enable ssl for this vhost
 #   - force: enable ssl and redirect non-ssl to ssl
 #   - only: enable ssl only
+#
 # php_safe_mode_exec_bins: An array of local binaries which should be linked in the
 #                          safe_mode_exec_bin for this hosting
 #                          *default*: None
@@ -164,6 +165,7 @@ define apache::vhost::template(
         ensure => $ensure,
         do_includes => $do_includes,
         run_mode => $run_mode,
+        ssl_mode => $ssl_mode,
         mod_security => $mod_security,
         htpasswd_file => $htpasswd_file,
         htpasswd_path => $htpasswd_path,