diff options
Diffstat (limited to 'manifests/vhost')
| -rw-r--r-- | manifests/vhost/php/drupal.pp | 8 | ||||
| -rw-r--r-- | manifests/vhost/php/joomla.pp | 8 | ||||
| -rw-r--r-- | manifests/vhost/php/mediawiki.pp | 8 | ||||
| -rw-r--r-- | manifests/vhost/php/simplemachine.pp | 8 | ||||
| -rw-r--r-- | manifests/vhost/php/spip.pp | 8 | ||||
| -rw-r--r-- | manifests/vhost/php/standard.pp | 16 | ||||
| -rw-r--r-- | manifests/vhost/php/typo3.pp | 8 | ||||
| -rw-r--r-- | manifests/vhost/php/webapp.pp | 14 | ||||
| -rw-r--r-- | manifests/vhost/php/wordpress.pp | 8 | ||||
| -rw-r--r-- | manifests/vhost/template.pp | 8 |
10 files changed, 90 insertions, 4 deletions
diff --git a/manifests/vhost/php/drupal.pp b/manifests/vhost/php/drupal.pp index a0666a7..3c7e9ea 100644 --- a/manifests/vhost/php/drupal.pp +++ b/manifests/vhost/php/drupal.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::drupal( $ensure = present, $domain = 'absent', @@ -22,6 +28,7 @@ define apache::vhost::php::drupal( $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', @@ -70,6 +77,7 @@ define apache::vhost::php::drupal( 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, diff --git a/manifests/vhost/php/joomla.pp b/manifests/vhost/php/joomla.pp index a61f59d..39d224e 100644 --- a/manifests/vhost/php/joomla.pp +++ b/manifests/vhost/php/joomla.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::joomla( $ensure = present, $domain = 'absent', @@ -22,6 +28,7 @@ define apache::vhost::php::joomla( $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', @@ -67,6 +74,7 @@ define apache::vhost::php::joomla( 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, diff --git a/manifests/vhost/php/mediawiki.pp b/manifests/vhost/php/mediawiki.pp index 1479443..9d8d201 100644 --- a/manifests/vhost/php/mediawiki.pp +++ b/manifests/vhost/php/mediawiki.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::mediawiki( $ensure = present, $domain = 'absent', @@ -22,6 +28,7 @@ define apache::vhost::php::mediawiki( $allow_override = 'FileInfo', $php_upload_tmp_dir = 'absent', $php_session_save_path = 'absent', + $php_default_charset = 'absent', $options = 'absent', $additional_options = 'absent', $default_charset = 'absent', @@ -53,6 +60,7 @@ define apache::vhost::php::mediawiki( allow_override => $allow_override, php_upload_tmp_dir => $php_upload_tmp_dir, php_session_save_path => $php_session_save_path, + php_default_charset => $php_default_charset, options => $options, additional_options => $additional_options, default_charset => $default_charset, diff --git a/manifests/vhost/php/simplemachine.pp b/manifests/vhost/php/simplemachine.pp index 62bbb3c..08916db 100644 --- a/manifests/vhost/php/simplemachine.pp +++ b/manifests/vhost/php/simplemachine.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::simplemachine( $ensure = present, $domain = 'absent', @@ -22,6 +28,7 @@ define apache::vhost::php::simplemachine( $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', @@ -65,6 +72,7 @@ define apache::vhost::php::simplemachine( 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, diff --git a/manifests/vhost/php/spip.pp b/manifests/vhost/php/spip.pp index d548f56..cacd5e9 100644 --- a/manifests/vhost/php/spip.pp +++ b/manifests/vhost/php/spip.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::spip( $ensure = present, $domain = 'absent', @@ -22,6 +28,7 @@ define apache::vhost::php::spip( $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', @@ -62,6 +69,7 @@ define apache::vhost::php::spip( 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, diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index 4739b33..f556a85 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.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::standard( $ensure = present, $domain = 'absent', @@ -28,6 +34,7 @@ define apache::vhost::php::standard( $php_use_pear = false, $php_safe_mode = true, $php_safe_mode_exec_bins = 'absent', + $php_default_charset = 'absent', $do_includes = false, $options = 'absent', $additional_options = 'absent', @@ -42,6 +49,14 @@ define apache::vhost::php::standard( $htpasswd_path = 'absent' ){ + $real_php_default_charset = $php_default_charset ? { + 'absent' => $default_charset ? { + 'On' => 'iso-8859-1', + default => $default_charset + }, + default => $php_default_charset + } + ::apache::vhost::phpdirs{"${name}": ensure => $ensure, php_upload_tmp_dir => $php_upload_tmp_dir, @@ -124,6 +139,7 @@ define apache::vhost::php::standard( php_use_smarty => $php_use_smarty, php_use_pear => $php_use_pear, php_safe_mode => $php_safe_mode, + php_default_charset => $real_php_default_charset, ssl_mode => $ssl_mode, htpasswd_file => $htpasswd_file, htpasswd_path => $htpasswd_path, diff --git a/manifests/vhost/php/typo3.pp b/manifests/vhost/php/typo3.pp index 6aa5293..950cba8 100644 --- a/manifests/vhost/php/typo3.pp +++ b/manifests/vhost/php/typo3.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::typo3( $ensure = present, $domain = 'absent', @@ -22,6 +28,7 @@ define apache::vhost::php::typo3( $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', @@ -65,6 +72,7 @@ define apache::vhost::php::typo3( 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, 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 } } diff --git a/manifests/vhost/php/wordpress.pp b/manifests/vhost/php/wordpress.pp index d12a989..0b94d4b 100644 --- a/manifests/vhost/php/wordpress.pp +++ b/manifests/vhost/php/wordpress.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::wordpress( $ensure = present, $domain = 'absent', @@ -22,6 +28,7 @@ define apache::vhost::php::wordpress( $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', @@ -66,6 +73,7 @@ define apache::vhost::php::wordpress( 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, diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp index ba2e4d1..bda1f04 100644 --- a/manifests/vhost/template.pp +++ b/manifests/vhost/template.pp @@ -14,7 +14,12 @@ # - 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 +# php_default_charset: default charset header for php. +# *default*: absent, which will set the same as default_charset +# of apache define apache::vhost::template( $ensure = present, $path = 'absent', @@ -35,6 +40,7 @@ define apache::vhost::template( $php_use_smarty = false, $php_use_pear = false, $php_safe_mode = true, + $php_default_charset = 'absent', $run_mode = 'normal', $run_uid = 'absent', $run_gid = 'absent', |