X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.debian.org.erb;h=972603db4577fddbd678e8961a6656769f6de8c6;hb=7b3a9d7a8a09ece8eecaff50fdc8cd513961dbdb;hp=8e512153ba698ddc4258e90433bf177180d1065f;hpb=c19a1cc33a2207247bb2f1155802700080fdc6fd;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 8e512153b..972603db4 100644 --- a/modules/roles/templates/apache-ftp.debian.org.erb +++ b/modules/roles/templates/apache-ftp.debian.org.erb @@ -4,17 +4,24 @@ ## > - ServerAdmin webmaster@debian.org - DocumentRoot /srv/ftp.debian.org/ftp.root - 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 %> + ServerAdmin debian-admin@debian.org + ServerName ftp.debian.org + ServerAlias debian.testing-anycast.mirrors.debian.org + <% if scope.function_onion_global_service_hostname(['ftp.debian.org']) -%> + ServerAlias <%= scope.function_onion_global_service_hostname(['ftp.debian.org']) %> + <% end %> - ErrorLog /var/log/apache2/ftp.debian.org-error.log - CustomLog /var/log/apache2/ftp.debian.org-access.log privacy + RedirectMatch "^/$" /debian/ + Alias /debian/ <%= archive_root %>/ - Use ftp-archive /srv/ftp.debian.org/ftp.root/debian + ErrorLog /var/log/apache2/ftp.debian.org-error.log + CustomLog /var/log/apache2/ftp.debian.org-access.log privacy + + Use ftp-archive <%= archive_root %> + + + UserDir disabled + # vim:set syn=apache: