X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.debian.org.erb;h=8f942ec997f7d92d04d6a3dd22608655257ef3ed;hb=3fdbdc914c0756335c344b1393925d641b8d5d15;hp=f964c014a372a7d902fb043a360115508172099f;hpb=2c9e56c30d184d40d77b48019269db96946b4377;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 f964c014a..8f942ec99 100644
--- a/modules/roles/templates/apache-ftp.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.debian.org.erb
@@ -3,22 +3,30 @@
 ## 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
 	<% if scope.function_onion_global_service_hostname(['ftp.debian.org']) -%>
 	ServerAlias <%= scope.function_onion_global_service_hostname(['ftp.debian.org']) %>
 	<% end %>
+	ServerAlias debian.backend.mirrors.debian.org
 	ServerAlias *.debian.backend.mirrors.debian.org
 
+	AddCharset UTF-8 .txt
+
 	RedirectMatch "^/$" /debian/
-	Alias /debian/ <%= archive_root %>/
+	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
 
-	Use ftp-archive <%= archive_root %>
+	Use ftp-archive <%= @archive_root %>
 
 	<IfModule mod_userdir.c>
 		UserDir disabled