X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.debian.org.erb;h=b44eec3dfd175934b97659829800449966933949;hb=e223cc6541f3d038e37352a0fac74010bd7ca624;hp=576eec0fa74b88ed44acd3820823ef63a9e9fe89;hpb=8d3ad68faaf8d0b4e555055b8eb22b42a930c0b1;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 576eec0fa..b44eec3df 100644
--- a/modules/roles/templates/apache-ftp.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.debian.org.erb
@@ -3,20 +3,34 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<VirtualHost <%= vhost_listen %>>
-	ServerAdmin webmaster@debian.org
+<VirtualHost <%= @vhost_listen %>>
+	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
+	</IfModule>
 </VirtualHost>
 
 # vim:set syn=apache: