diff options
Diffstat (limited to 'manifests/defines/vhost_varieties.pp')
| -rw-r--r-- | manifests/defines/vhost_varieties.pp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp index fbf58d7..f84e537 100644 --- a/manifests/defines/vhost_varieties.pp +++ b/manifests/defines/vhost_varieties.pp @@ -23,9 +23,10 @@ define apache::vhost::static( $documentroot_group = 0, $documentroot_mode = 0750, $allow_override = 'None', + $do_includes = false, $options = 'absent', $additional_options = 'absent', - $ssl_mode = 'false', + $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', $vhost_destination = 'absent', @@ -52,12 +53,13 @@ define apache::vhost::static( domain => $domain, domainalias => $domainalias, allow_override => $allow_override, + do_includes => $do_includes, options => $options, additional_options => $additional_options, ssl_mode => $ssl_mode, htpasswd_file => $htpasswd_file, htpasswd_path => $htpasswd_path, - mod_security => 'false', + mod_security => false, } } @@ -73,10 +75,11 @@ define apache::vhost::php::standard( $allow_override = 'None', $upload_tmp_dir = 'absent', $session_save_path = 'absent', + $do_includes = false, $options = 'absent', $additional_options = 'absent', - $mod_security = 'true', - $ssl_mode = 'false', + $mod_security = true, + $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', $vhost_destination = 'absent', @@ -133,6 +136,7 @@ define apache::vhost::php::standard( domain => $domain, domainalias => $domainalias, allow_override => $allow_override, + do_includes => $do_includes, options => $options, additional_options => $additional_options, php_upload_tmp_dir => $real_upload_tmp_dir, @@ -164,10 +168,11 @@ define apache::vhost::modperl( $run_gid = 'absent', $allow_override = 'None', $cgi_binpath = 'absent', + $do_includes = false, $options = 'absent', $additional_options = 'absent', - $mod_security = 'true', - $ssl_mode = 'false', + $mod_security = true, + $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', $vhost_destination = 'absent', @@ -218,6 +223,7 @@ define apache::vhost::modperl( run_uid => $run_uid, run_gid => $run_gid, allow_override => $allow_override, + do_includes => $do_includes, options => $options, additional_options => $additional_options, cgi_binpath => $real_cgi_binpath, @@ -226,5 +232,4 @@ define apache::vhost::modperl( htpasswd_path => $htpasswd_path, mod_security => $mod_security, } - } |