diff options
Diffstat (limited to 'manifests/vhost')
| -rw-r--r-- | manifests/vhost/file.pp | 29 | ||||
| -rw-r--r-- | manifests/vhost/template.pp | 2 |
2 files changed, 29 insertions, 2 deletions
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, |