X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.debian.org.erb;h=8f942ec997f7d92d04d6a3dd22608655257ef3ed;hb=1dee729d00307f93d600b5bb6902494bd30a4484;hp=6dda3727a446179f236b78b558da53d15f3aa1e8;hpb=f7b6fdd2d515765d88696ced52fb0e7e4dda06c0;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 6dda3727a..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
@@ -13,8 +13,15 @@
 	ServerAlias debian.backend.mirrors.debian.org
 	ServerAlias *.debian.backend.mirrors.debian.org
 
+	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/>
+		Require all granted
+	</Directory>
 
 	ErrorLog /var/log/apache2/ftp.debian.org-error.log
 	CustomLog /var/log/apache2/ftp.debian.org-access.log privacy