From d31cce2ed31d4e107c5418fed8d3d3b49a6bceb6 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 5 Jul 2013 20:52:16 +0200 Subject: [PATCH] Try to set utf8 on ftp-master.metadata --- .../roles/templates/static-mirroring/static-vhost.conf.erb | 7 ++++++- .../static-mirroring/vhost/static-vhosts-simple.erb | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb index 6ab16d3c8..53e588a30 100644 --- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb +++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb @@ -19,7 +19,7 @@ - + > ServerName $name ServerAdmin debian-admin@lists.debian.org @@ -28,6 +28,7 @@ CustomLog /var/log/apache2/$name-access.log privacy Use common-static-base $name + $extra @@ -46,5 +47,9 @@ + + Use common-static-vhost-with-extra $name "# nada" + + # vim:ft=apache: diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb index e1815f82f..41947136b 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -3,8 +3,8 @@ Use common-static-vhost mozilla.debian.net Use common-static-vhost backports.debian.org Use common-static-vhost-publiclog bits.debian.org -Use common-static-vhost ftp-master.metadata.debian.org Use common-static-vhost news.debian.net +Use common-static-vhost-with-extra ftp-master.metadata.debian.org "AddDefaultCharset utf-8" # www.backports.org is the historical place for the backports # website and archive. It is now a CNAME to backports.debian.org: -- 2.20.1