X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.debian.org.erb;h=8f942ec997f7d92d04d6a3dd22608655257ef3ed;hb=50d609a31adea8d5d54f372c73a8dcda93fd478d;hp=73cdb95595d16de694e5d75e0886bad5c7b49399;hpb=f63ad0205f46c06aac465fbf0f9daf5f6edf9e67;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/apache-ftp.debian.org.erb b/modules/roles/templates/apache-ftp.debian.org.erb
index 73cdb9559..8f942ec99 100644
--- a/modules/roles/templates/apache-ftp.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.debian.org.erb
@@ -3,7 +3,7 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<VirtualHost <%= @vhost_listen %>>
+<VirtualHost <%= @vhost_listen %> 127.0.0.1:80 [::1]:80 >
 	ServerAdmin debian-admin@debian.org
 	ServerName ftp.debian.org
 	ServerAlias debian.anycast-test.mirrors.debian.org
@@ -16,6 +16,7 @@
 	AddCharset UTF-8 .txt
 
 	RedirectMatch "^/$" /debian/
+	RedirectMatch "^/debian$" /debian/
 	Alias /debian/ <%= @archive_root %>/
 	Alias /_health /run/dsa-mirror-health-ftp/health
 	<Directory /run/dsa-mirror-health-ftp/>