diff options
| author | Andreas <andreas@immerda.ch> | 2009-11-18 17:14:54 +0100 |
|---|---|---|
| committer | Andreas <andreas@immerda.ch> | 2009-11-18 17:14:54 +0100 |
| commit | 211812c875cf0d6bfbf96d30b23ecaed7aee1fb3 (patch) | |
| tree | 4847c59d2ce3cfa4f28182e6df0694e845d08e0d | |
| parent | fd26d9977a7f3723f56b063dd813af4af4202c5a (diff) | |
add php_bin_dir for typo3
| -rw-r--r-- | manifests/vhost/php/typo3.pp | 10 | ||||
| -rw-r--r-- | templates/vhosts/php_typo3/CentOS.erb | 6 |
2 files changed, 16 insertions, 0 deletions
diff --git a/manifests/vhost/php/typo3.pp b/manifests/vhost/php/typo3.pp index 08ab2db..dcc10bc 100644 --- a/manifests/vhost/php/typo3.pp +++ b/manifests/vhost/php/typo3.pp @@ -19,6 +19,7 @@ define apache::vhost::php::typo3( $run_uid = 'absent', $run_gid = 'absent', $allow_override = 'None', + $php_bin_dir = 'absent', $php_upload_tmp_dir = 'absent', $php_session_save_path = 'absent', $do_includes = false, @@ -44,6 +45,14 @@ define apache::vhost::php::typo3( default => "${path}/www" } + $php_bin_dir = $path ? { + 'absent' => $operatingsystem ? { + openbsd => "/var/www/htdocs/${name}/bin", + default => "/var/www/vhosts/${name}/bin" + }, + default => "${path}/bin" + } + # create vhost configuration file ::apache::vhost::php::webapp{$name: ensure => $ensure, @@ -61,6 +70,7 @@ define apache::vhost::php::typo3( run_uid => $run_uid, run_gid => $run_gid, allow_override => $allow_override, + php_bin_dir => $php_bin_dir, php_upload_tmp_dir => $php_upload_tmp_dir, php_session_save_path => $php_session_save_path, do_includes => $do_includes, diff --git a/templates/vhosts/php_typo3/CentOS.erb b/templates/vhosts/php_typo3/CentOS.erb index 7825a1b..5631bb5 100644 --- a/templates/vhosts/php_typo3/CentOS.erb +++ b/templates/vhosts/php_typo3/CentOS.erb @@ -44,6 +44,9 @@ php_admin_value open_basedir <%= documentroot %>:<%= real_php_upload_tmp_dir %>:<%= real_php_session_save_path %> php_admin_value upload_tmp_dir <%= real_php_upload_tmp_dir %> php_admin_value session.save_path <%= real_php_session_save_path %> + <%- unless real_php_bin_dir.to_s == 'absent' then -%> + php_admin_value safe_mode_exec_dir <%= real_php_bin_dir %> + <%- end -%> </Directory> <%- end -%> @@ -122,6 +125,9 @@ php_admin_value open_basedir <%= documentroot %>:<%= real_php_upload_tmp_dir %>:<%= real_php_session_save_path %> php_admin_value upload_tmp_dir <%= real_php_upload_tmp_dir %> php_admin_value session.save_path <%= real_php_session_save_path %> + <%- unless real_php_bin_dir.to_s == 'absent' then -%> + php_admin_value safe_mode_exec_dir <%= real_php_bin_dir %> + <%- end -%> </Directory> <IfModule mod_security2.c> |