diff options
author | Andreas <andreas@immerda.ch> | 2009-11-18 17:06:07 +0100 |
---|---|---|
committer | Andreas <andreas@immerda.ch> | 2009-11-18 17:06:07 +0100 |
commit | f9eb500201f27ecb95fad84ae4d5bae4808aea66 (patch) | |
tree | 9ce881e0a2c5ab9e185946c440a084103a17756f | |
parent | 9e1422ebd6728856fb5ab5cbc0fc5b88406ab9c1 (diff) |
added a dir for binaries (php safe_mode_exec_dir)
-rw-r--r-- | manifests/vhost.pp | 2 | ||||
-rw-r--r-- | manifests/vhost/php/standard.pp | 3 | ||||
-rw-r--r-- | manifests/vhost/php/webapp.pp | 2 | ||||
-rw-r--r-- | manifests/vhost/phpdirs.pp | 8 | ||||
-rw-r--r-- | manifests/vhost/template.pp | 8 | ||||
-rw-r--r-- | templates/vhosts/php/CentOS.erb | 6 |
6 files changed, 29 insertions, 0 deletions
diff --git a/manifests/vhost.pp b/manifests/vhost.pp index 0f12ece..f845162 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -18,6 +18,7 @@ define apache::vhost( $domainalias = 'absent', $server_admin = 'absent', $allow_override = 'None', + $php_bin_dir = 'absent', $php_upload_tmp_dir = 'absent', $php_session_save_path = 'absent', $php_use_smarty = false, @@ -62,6 +63,7 @@ define apache::vhost( domain => $domain, domainalias => $domainalias, server_admin => $server_admin, + php_bin_dir => $php_bin_dir, php_upload_tmp_dir => $php_upload_tmp_dir, php_session_save_path => $php_session_save_path, cgi_binpath => $cgi_binpath, diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index 2518962..00a5216 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -22,6 +22,7 @@ define apache::vhost::php::standard( $run_uid = 'absent', $run_gid = 'absent', $allow_override = 'None', + $php_bin_dir = 'absent', $php_upload_tmp_dir = 'absent', $php_session_save_path = 'absent', $php_use_smarty = false, @@ -43,6 +44,7 @@ define apache::vhost::php::standard( ::apache::vhost::phpdirs{"${name}": ensure => $ensure, + php_bin_dir => $php_bin_dir, php_upload_tmp_dir => $php_upload_tmp_dir, php_session_save_path => $php_session_save_path, documentroot_owner => $documentroot_owner, @@ -90,6 +92,7 @@ define apache::vhost::php::standard( options => $options, additional_options => $additional_options, default_charset => $default_charset, + php_bin_dir => $php_bin_dir, php_upload_tmp_dir => $php_upload_tmp_dir, php_session_save_path => $php_session_save_path, php_use_smarty => $php_use_smarty, diff --git a/manifests/vhost/php/webapp.pp b/manifests/vhost/php/webapp.pp index b448ee2..4abb63c 100644 --- a/manifests/vhost/php/webapp.pp +++ b/manifests/vhost/php/webapp.pp @@ -22,6 +22,7 @@ define apache::vhost::php::webapp( $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, @@ -89,6 +90,7 @@ define apache::vhost::php::webapp( 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/manifests/vhost/phpdirs.pp b/manifests/vhost/phpdirs.pp index 24413d0..3593408 100644 --- a/manifests/vhost/phpdirs.pp +++ b/manifests/vhost/phpdirs.pp @@ -1,5 +1,6 @@ define apache::vhost::phpdirs( $ensure = present, + $php_bin_dir = 'absent', $php_upload_tmp_dir = 'absent', $php_session_save_path = 'absent', $documentroot_owner = apache, @@ -8,6 +9,13 @@ define apache::vhost::phpdirs( $run_mode = 'normal', $run_uid = 'absent' ){ + # php bin_dir + case $php_bin_dir { + 'absent': { + $real_php_bin_dir = "/var/www/vhosts/$name/bin" + } + default: { $real_php_upload_tmp_dir = $php_upload_tmp_dir } + } # php upload_tmp_dir case $php_upload_tmp_dir { 'absent': { diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp index 8ce6484..75cb9cf 100644 --- a/manifests/vhost/template.pp +++ b/manifests/vhost/template.pp @@ -24,6 +24,7 @@ define apache::vhost::template( $domainalias = 'absent', $server_admin = 'absent', $allow_override = 'None', + $php_bin_dir = 'absent', $php_upload_tmp_dir = 'absent', $php_session_save_path = 'absent', $cgi_binpath = 'absent', @@ -94,6 +95,13 @@ define apache::vhost::template( } # set default dirs for templates + # php bin_dir + case $php_bin_dir { + 'absent': { + $real_php_bin_dir = "/var/www/vhosts/$name/bin" + } + default: { $real_php_bin_dir = $php_bin_dir } + } # php upload_tmp_dir case $php_upload_tmp_dir { 'absent': { diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb index bf15796..85ec15e 100644 --- a/templates/vhosts/php/CentOS.erb +++ b/templates/vhosts/php/CentOS.erb @@ -45,6 +45,9 @@ php_admin_value open_basedir <%- if php_use_smarty.to_s == 'true' -%>/usr/share/php/Smarty/:<%- end -%><%- if php_use_pear.to_s == 'true' -%>/usr/share/pear/:<%- end -%><%= 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 -%> @@ -111,6 +114,9 @@ php_admin_value open_basedir <%- if php_use_smarty.to_s == 'true' -%>/usr/share/php/Smarty/:<%- end -%><%- if php_use_pear.to_s == 'true' -%>/usr/share/pear/:<%- end -%><%= 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> |