summaryrefslogtreecommitdiff
path: root/manifests/defines/vhost_varieties.pp
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2008-12-06 12:17:48 +0000
committermh <mh@immerda.ch>2008-12-06 12:17:48 +0000
commitaac520a5ce0051034f68b1aa88c5fe181c89d160 (patch)
tree2182f9716255734371e185229cb63b7a896f32b9 /manifests/defines/vhost_varieties.pp
parent60c2f219d5531873899fed29e4ddc6d52ab7e268 (diff)
- added default charset possiblity
- enabled ssl on all 3 vhost modes
Diffstat (limited to 'manifests/defines/vhost_varieties.pp')
-rw-r--r--manifests/defines/vhost_varieties.pp6
1 files changed, 6 insertions, 0 deletions
diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp
index f84e537..1f2a0ed 100644
--- a/manifests/defines/vhost_varieties.pp
+++ b/manifests/defines/vhost_varieties.pp
@@ -26,6 +26,7 @@ define apache::vhost::static(
$do_includes = false,
$options = 'absent',
$additional_options = 'absent',
+ $default_charset = 'absent',
$ssl_mode = false,
$vhost_mode = 'template',
$vhost_source = 'absent',
@@ -56,6 +57,7 @@ define apache::vhost::static(
do_includes => $do_includes,
options => $options,
additional_options => $additional_options,
+ default_charset => $default_charset,
ssl_mode => $ssl_mode,
htpasswd_file => $htpasswd_file,
htpasswd_path => $htpasswd_path,
@@ -78,6 +80,7 @@ define apache::vhost::php::standard(
$do_includes = false,
$options = 'absent',
$additional_options = 'absent',
+ $default_charset = 'absent',
$mod_security = true,
$ssl_mode = false,
$vhost_mode = 'template',
@@ -139,6 +142,7 @@ define apache::vhost::php::standard(
do_includes => $do_includes,
options => $options,
additional_options => $additional_options,
+ default_charset => $default_charset,
php_upload_tmp_dir => $real_upload_tmp_dir,
php_session_save_path => $real_session_save_path,
ssl_mode => $ssl_mode,
@@ -171,6 +175,7 @@ define apache::vhost::modperl(
$do_includes = false,
$options = 'absent',
$additional_options = 'absent',
+ $default_charset = 'absent',
$mod_security = true,
$ssl_mode = false,
$vhost_mode = 'template',
@@ -226,6 +231,7 @@ define apache::vhost::modperl(
do_includes => $do_includes,
options => $options,
additional_options => $additional_options,
+ default_charset => $default_charset,
cgi_binpath => $real_cgi_binpath,
ssl_mode => $ssl_mode,
htpasswd_file => $htpasswd_file,