diff options
| author | Marcel Haerry <haerry@puzzle.ch> | 2009-05-19 19:00:08 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-05-23 01:25:15 +0200 |
| commit | f7af20fcb68444d4f14fc394e465078a05a4bee4 (patch) | |
| tree | b45940fd58d049ceea2f46164c11e8510226b442 /templates | |
| parent | 61111f2a5206cf6bf56434f4ce776ebc467e9230 (diff) | |
removing double add default charset, adding where it have been missing
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/vhosts/php/CentOS.erb | 3 | ||||
| -rw-r--r-- | templates/vhosts/php_drupal/CentOS.erb | 3 | ||||
| -rw-r--r-- | templates/vhosts/php_joomla/CentOS.erb | 3 | ||||
| -rw-r--r-- | templates/vhosts/php_simplemachine/CentOS.erb | 3 | ||||
| -rw-r--r-- | templates/vhosts/php_wordpress/CentOS.erb | 3 | ||||
| -rw-r--r-- | templates/vhosts/static/OpenBSD.erb | 4 |
6 files changed, 4 insertions, 15 deletions
diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb index 5f9fa4c..39b5f36 100644 --- a/templates/vhosts/php/CentOS.erb +++ b/templates/vhosts/php/CentOS.erb @@ -77,9 +77,6 @@ ErrorLog <%= logdir %>/error_log CustomLog <%= logdir %>/access_log combined - <%- if default_charset.to_s != 'absent' then -%> - AddDefaultCharset <%= default_charset %> - <%- end -%> <%- if run_mode.to_s == 'itk' -%> <IfModule mpm_itk_module> AssignUserId <%= run_uid+" "+run_gid %> diff --git a/templates/vhosts/php_drupal/CentOS.erb b/templates/vhosts/php_drupal/CentOS.erb index f92e3b0..0b51c3b 100644 --- a/templates/vhosts/php_drupal/CentOS.erb +++ b/templates/vhosts/php_drupal/CentOS.erb @@ -102,9 +102,6 @@ ErrorLog <%= logdir %>/error_log CustomLog <%= logdir %>/access_log combined - <%- if default_charset.to_s != 'absent' then -%> - AddDefaultCharset <%= default_charset %> - <%- end -%> <%- if run_mode.to_s == 'itk' -%> <IfModule mpm_itk_module> AssignUserId <%= run_uid+" "+run_gid %> diff --git a/templates/vhosts/php_joomla/CentOS.erb b/templates/vhosts/php_joomla/CentOS.erb index b39a47c..fb8a49f 100644 --- a/templates/vhosts/php_joomla/CentOS.erb +++ b/templates/vhosts/php_joomla/CentOS.erb @@ -103,9 +103,6 @@ ErrorLog <%= logdir %>/error_log CustomLog <%= logdir %>/access_log combined - <%- if default_charset.to_s != 'absent' then -%> - AddDefaultCharset <%= default_charset %> - <%- end -%> <%- if run_mode.to_s == 'itk' -%> <IfModule mpm_itk_module> AssignUserId <%= run_uid+" "+run_gid %> diff --git a/templates/vhosts/php_simplemachine/CentOS.erb b/templates/vhosts/php_simplemachine/CentOS.erb index 3922c0e..271aea8 100644 --- a/templates/vhosts/php_simplemachine/CentOS.erb +++ b/templates/vhosts/php_simplemachine/CentOS.erb @@ -77,9 +77,6 @@ ErrorLog <%= logdir %>/error_log CustomLog <%= logdir %>/access_log combined - <%- if default_charset.to_s != 'absent' then -%> - AddDefaultCharset <%= default_charset %> - <%- end -%> <%- if run_mode.to_s == 'itk' -%> <IfModule mpm_itk_module> AssignUserId <%= run_uid+" "+run_gid %> diff --git a/templates/vhosts/php_wordpress/CentOS.erb b/templates/vhosts/php_wordpress/CentOS.erb index 560617e..ff46637 100644 --- a/templates/vhosts/php_wordpress/CentOS.erb +++ b/templates/vhosts/php_wordpress/CentOS.erb @@ -79,9 +79,6 @@ ErrorLog <%= logdir %>/error_log CustomLog <%= logdir %>/access_log combined - <%- if default_charset.to_s != 'absent' then -%> - AddDefaultCharset <%= default_charset %> - <%- end -%> <%- if run_mode.to_s == 'itk' -%> <IfModule mpm_itk_module> AssignUserId <%= run_uid+" "+run_gid %> diff --git a/templates/vhosts/static/OpenBSD.erb b/templates/vhosts/static/OpenBSD.erb index 5b1e792..3f95989 100644 --- a/templates/vhosts/static/OpenBSD.erb +++ b/templates/vhosts/static/OpenBSD.erb @@ -54,6 +54,10 @@ ErrorLog <%= logdir %>/error_log CustomLog <%= logdir %>/access_log combined + <%- if default_charset.to_s != 'absent' then -%> + AddDefaultCharset <%= default_charset %> + <%- end -%> + <%- if options.to_s != 'absent' or htpasswd_file.to_s != 'absent' then -%> <Directory "<%= documentroot %>/"> <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%> |