diff options
| author | mh <mh@immerda.ch> | 2010-01-02 00:53:30 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-01-02 00:53:30 +0100 |
| commit | 6871f1324f55c8b1bd3ca06aae0802fd1dffde50 (patch) | |
| tree | 17eca6b84809b1c208945b36f7b05455732c1918 | |
| parent | d34e97e8b4e4298f188c66aaba73af8816d263a0 (diff) | |
we have already a default charset flag we manage
| -rw-r--r-- | manifests/vhost/php/gallery2.pp | 2 | ||||
| -rw-r--r-- | templates/vhosts/php_gallery2/CentOS.erb | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/manifests/vhost/php/gallery2.pp b/manifests/vhost/php/gallery2.pp index 21ad986..0a9bd7b 100644 --- a/manifests/vhost/php/gallery2.pp +++ b/manifests/vhost/php/gallery2.pp @@ -28,7 +28,7 @@ define apache::vhost::php::gallery2( $php_upload_tmp_dir = 'absent', $php_session_save_path = 'absent', $php_safe_mode_exec_bins = 'absent', - $php_default_charset = 'absent', + $php_default_charset = 'UTF-8', $do_includes = false, $options = 'absent', $additional_options = 'absent', diff --git a/templates/vhosts/php_gallery2/CentOS.erb b/templates/vhosts/php_gallery2/CentOS.erb index 5c9b354..92d5e05 100644 --- a/templates/vhosts/php_gallery2/CentOS.erb +++ b/templates/vhosts/php_gallery2/CentOS.erb @@ -3,8 +3,6 @@ <VirtualHost *:80> Include conf.d/defaults.inc - AddDefaultCharset utf-8 - ServerName <%= servername %> <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> @@ -80,8 +78,6 @@ Include conf.d/defaults.inc Include conf.d/ssl_defaults.inc - AddDefaultCharset utf-8 - ServerName <%= servername %> <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> |