Merge branch 'master' of ipuppet@git.puppet.immerda.ch:module-apache

4 files changed, 24 insertions, 0 deletions

diff --git a/templates/vhosts/php_drupal/CentOS.erb b/templates/vhosts/php_drupal/CentOS.erb
index b48dbec..636089a 100644
--- a/templates/vhosts/php_drupal/CentOS.erb
+++ b/templates/vhosts/php_drupal/CentOS.erb
@@ -42,6 +42,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_safe_mode_exec_bin_dir.to_s == 'absent' then -%>
+        php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %>
+        <%- end -%>
 
         php_value magic_quotes_gpc                0
         php_value register_globals                0
@@ -130,6 +133,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_safe_mode_exec_bin_dir.to_s == 'absent' then -%>
+        php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %>
+        <%- end -%>
 
         php_value magic_quotes_gpc                0       
         php_value register_globals                0       
diff --git a/templates/vhosts/php_joomla/CentOS.erb b/templates/vhosts/php_joomla/CentOS.erb
index fe91459..1384578 100644
--- a/templates/vhosts/php_joomla/CentOS.erb
+++ b/templates/vhosts/php_joomla/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_safe_mode_exec_bin_dir.to_s == 'absent' then -%>
+        php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %>
+        <%- end -%>
     </Directory>
     <%- end -%>
 	
@@ -133,6 +136,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_safe_mode_exec_bin_dir.to_s == 'absent' then -%>
+        php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %>
+        <%- end -%>
     </Directory>
 
     <IfModule mod_security2.c>
diff --git a/templates/vhosts/php_spip/CentOS.erb b/templates/vhosts/php_spip/CentOS.erb
index bf15796..4f54aaa 100644
--- a/templates/vhosts/php_spip/CentOS.erb
+++ b/templates/vhosts/php_spip/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_safe_mode_exec_bin_dir.to_s == 'absent' then -%>
+        php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_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_safe_mode_exec_bin_dir.to_s == 'absent' then -%>
+        php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %>
+        <%- end -%>
     </Directory>
 
     <IfModule mod_security2.c>
diff --git a/templates/vhosts/php_wordpress/CentOS.erb b/templates/vhosts/php_wordpress/CentOS.erb
index 88da307..6022721 100644
--- a/templates/vhosts/php_wordpress/CentOS.erb
+++ b/templates/vhosts/php_wordpress/CentOS.erb
@@ -42,6 +42,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_safe_mode_exec_bin_dir.to_s == 'absent' then -%>
+        php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %>
+        <%- end -%>
     </Directory>
     <%- end -%>
 	
@@ -107,6 +110,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_safe_mode_exec_bin_dir.to_s == 'absent' then -%>
+        php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %>
+        <%- end -%>
     </Directory>
 
     <IfModule mod_security2.c>