X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.debian.org.erb;h=8f942ec997f7d92d04d6a3dd22608655257ef3ed;hb=d37aae2f20083c472de30925ff3e16a692408a11;hp=a34002b11801c9e773a2e4b653a161927541c726;hpb=4981581e188e970c4e711b2992a99c492a5a9f35;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 a34002b11..8f942ec99 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
-        ServerName ftp.debian.org
-        <% if scope.function_onion_global_service_hostname(['ftp.debian.org']) -%>
-        ServerAlias <%= scope.function_onion_global_service_hostname(['ftp.debian.org']) %>
-        <% end %>
+<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
 
-        RedirectMatch "^/$" /debian/
-        Alias /debian/ <%= archive_root %>/
+	AddCharset UTF-8 .txt
 
-        ErrorLog /var/log/apache2/ftp.debian.org-error.log
-        CustomLog /var/log/apache2/ftp.debian.org-access.log privacy
+	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>
 
-        Use ftp-archive <%= archive_root %>
+	ErrorLog /var/log/apache2/ftp.debian.org-error.log
+	CustomLog /var/log/apache2/ftp.debian.org-access.log privacy
+
+	Use ftp-archive <%= @archive_root %>
+
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
 </VirtualHost>
 
 # vim:set syn=apache: