summaryrefslogtreecommitdiff
path: root/manifests/vhost/php/webapp.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/vhost/php/webapp.pp')
-rw-r--r--manifests/vhost/php/webapp.pp14
1 files changed, 11 insertions, 3 deletions
diff --git a/manifests/vhost/php/webapp.pp b/manifests/vhost/php/webapp.pp
index 71f78a9..e9c7f3e 100644
--- a/manifests/vhost/php/webapp.pp
+++ b/manifests/vhost/php/webapp.pp
@@ -4,6 +4,12 @@
# and run_uid and run_gid are used as vhost users
# run_uid: the uid the vhost should run as with the itk module
# run_gid: the gid the vhost should run as with the itk module
+# 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
+# php_default_charset: default charset header for php.
+# *default*: absent, which will set the same as default_charset
+# of apache
define apache::vhost::php::webapp(
$ensure = present,
$domain = 'absent',
@@ -24,6 +30,8 @@ define apache::vhost::php::webapp(
$allow_override = 'None',
$php_upload_tmp_dir = 'absent',
$php_session_save_path = 'absent',
+ $php_safe_mode_exec_bins = 'absent',
+ $php_default_charset = 'absent',
$do_includes = false,
$options = 'absent',
$additional_options = 'absent',
@@ -39,8 +47,7 @@ define apache::vhost::php::webapp(
$config_file = 'absent',
$config_webwriteable = false,
$manage_directories = true,
- $managed_directories = 'absent',
- $php_safe_mode_exec_bins = 'absent'
+ $managed_directories = 'absent'
){
if ($ensure != 'absent') {
if $manage_directories and ($managed_directories != 'absent') {
@@ -92,6 +99,8 @@ define apache::vhost::php::webapp(
allow_override => $allow_override,
php_upload_tmp_dir => $php_upload_tmp_dir,
php_session_save_path => $php_session_save_path,
+ php_safe_mode_exec_bins => $php_safe_mode_exec_bins,
+ php_default_charset => $php_default_charset,
do_includes => $do_includes,
options => $options,
additional_options => $additional_options,
@@ -103,7 +112,6 @@ define apache::vhost::php::webapp(
vhost_destination => $vhost_destination,
htpasswd_file => $htpasswd_file,
htpasswd_path => $htpasswd_path,
- php_safe_mode_exec_bins => $php_safe_mode_exec_bins
}
}