introduce php_default_charset to set charset header in php

8 files changed, 48 insertions, 0 deletions

diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb
index 4f54aaa..ef7df55 100644
--- a/templates/vhosts/php/CentOS.erb
+++ b/templates/vhosts/php/CentOS.erb
@@ -42,6 +42,9 @@
         <%- if php_safe_mode.to_s == 'false' -%>
         php_admin_flag safe_mode Off
         <%- end -%>
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         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 %>
@@ -111,6 +114,9 @@
         <%- if php_safe_mode.to_s == 'false' -%>
         php_admin_flag safe_mode Off
         <%- end -%>
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         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 %>
diff --git a/templates/vhosts/php_drupal/CentOS.erb b/templates/vhosts/php_drupal/CentOS.erb
index 636089a..995bb7e 100644
--- a/templates/vhosts/php_drupal/CentOS.erb
+++ b/templates/vhosts/php_drupal/CentOS.erb
@@ -39,6 +39,9 @@
         require valid-user
         <%- end -%>
         php_admin_flag engine on
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         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 %>
@@ -130,6 +133,9 @@
         require valid-user
         <%- end -%>
         php_admin_flag engine on
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         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 %>
diff --git a/templates/vhosts/php_joomla/CentOS.erb b/templates/vhosts/php_joomla/CentOS.erb
index 1384578..5107a59 100644
--- a/templates/vhosts/php_joomla/CentOS.erb
+++ b/templates/vhosts/php_joomla/CentOS.erb
@@ -41,6 +41,9 @@
         require valid-user
         <%- end -%>
         php_admin_flag engine on
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         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 %>
@@ -133,6 +136,9 @@
         require valid-user
         <%- end -%>
         php_admin_flag engine on
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         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 %>
diff --git a/templates/vhosts/php_mediawiki/CentOS.erb b/templates/vhosts/php_mediawiki/CentOS.erb
index a268c82..c9585f3 100644
--- a/templates/vhosts/php_mediawiki/CentOS.erb
+++ b/templates/vhosts/php_mediawiki/CentOS.erb
@@ -40,6 +40,9 @@
         <%- end -%>
         php_admin_flag engine on
         php_admin_value safe_mode off
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         php_admin_value open_basedir /var/www/mediawiki/:<%= 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 %>
@@ -104,6 +107,9 @@
         <%- end -%>
         php_admin_flag engine on
         php_admin_value safe_mode off
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         php_admin_value open_basedir /var/www/mediawiki/:<%= 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 %>
diff --git a/templates/vhosts/php_simplemachine/CentOS.erb b/templates/vhosts/php_simplemachine/CentOS.erb
index e1008d2..8dc2c46 100644
--- a/templates/vhosts/php_simplemachine/CentOS.erb
+++ b/templates/vhosts/php_simplemachine/CentOS.erb
@@ -39,6 +39,9 @@
         require valid-user
         <%- end -%>
         php_admin_flag engine on
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         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 %>
@@ -102,6 +105,9 @@
         require valid-user
         <%- end -%>
         php_admin_flag engine on
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         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 %>
diff --git a/templates/vhosts/php_spip/CentOS.erb b/templates/vhosts/php_spip/CentOS.erb
index 4f54aaa..ef7df55 100644
--- a/templates/vhosts/php_spip/CentOS.erb
+++ b/templates/vhosts/php_spip/CentOS.erb
@@ -42,6 +42,9 @@
         <%- if php_safe_mode.to_s == 'false' -%>
         php_admin_flag safe_mode Off
         <%- end -%>
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         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 %>
@@ -111,6 +114,9 @@
         <%- if php_safe_mode.to_s == 'false' -%>
         php_admin_flag safe_mode Off
         <%- end -%>
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         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 %>
diff --git a/templates/vhosts/php_typo3/CentOS.erb b/templates/vhosts/php_typo3/CentOS.erb
index 2fba4bf..1b244f3 100644
--- a/templates/vhosts/php_typo3/CentOS.erb
+++ b/templates/vhosts/php_typo3/CentOS.erb
@@ -41,6 +41,9 @@
         require valid-user
         <%- end -%>
         php_admin_flag engine on
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         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 %>
@@ -122,6 +125,9 @@
         require valid-user
         <%- end -%>
         php_admin_flag engine on
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         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 %>
diff --git a/templates/vhosts/php_wordpress/CentOS.erb b/templates/vhosts/php_wordpress/CentOS.erb
index 6022721..59b4e20 100644
--- a/templates/vhosts/php_wordpress/CentOS.erb
+++ b/templates/vhosts/php_wordpress/CentOS.erb
@@ -39,6 +39,9 @@
         require valid-user
         <%- end -%>
         php_admin_flag engine on
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         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 %>
@@ -107,6 +110,9 @@
         require valid-user
         <%- end -%>
         php_admin_flag engine on
+        <%- unless php_default_charset.to_s == 'absent' then -%>
+        php_admin_value default_charset <%= php_default_charset %>
+        <%- end -%>
         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 %>