Try to set utf8 on ftp-master.metadata

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 6ab16d3c8bad6cc61f0ad8b32ef502f3d67ce84f..53e588a300b32011d162034cd36e7a48a4376ce7 100644 (file)
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -19,7 +19,7 @@
 </Macro>
 
 
-<Macro common-static-vhost $name>
+<Macro common-static-vhost-with-extra $name $extra>
        <Virtualhost <%= vhost_listen %> >
                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
        </VirtualHost>
 </Macro>
 
@@ -46,5 +47,9 @@
        </VirtualHost>
 </Macro>
 
+<Macro common-static-vhost $name>
+       Use common-static-vhost-with-extra $name "# nada"
+</Macro>
+
 
 # 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 e1815f82f4e7779e43234c32e5a90732efa63358..41947136bb39a93cc5de4dd022581fd4666147a9 100644 (file)
--- 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: