diff options
author | mh <mh@immerda.ch> | 2010-08-16 21:51:22 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2010-08-16 21:51:22 +0200 |
commit | b3a17cff5315fbbda901a6f1d406c3500cf65a3a (patch) | |
tree | 24333b39346d8f6334fba28deaba415bf1ce700e /manifests/vhost/file.pp | |
parent | e8e48e7fc60d5551a315f9b0b6a01adfdc0e3558 (diff) |
fix various missing things for itk_plus mode
Diffstat (limited to 'manifests/vhost/file.pp')
-rw-r--r-- | manifests/vhost/file.pp | 29 |
1 files changed, 27 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", |