X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.debian.org.erb;h=534c8b142a411da3025e593a163b77504a5c4d8f;hb=a9b74cf4ae86eafe8b17f05266203f46ad587d44;hp=98841dc7e409de278d373d5380e097763b4b7886;hpb=bb6fa3a8749bd6860ec6f167d62db9119434886a;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 98841dc7e..534c8b142 100644 --- a/modules/roles/templates/apache-ftp.debian.org.erb +++ b/modules/roles/templates/apache-ftp.debian.org.erb @@ -3,20 +3,29 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## -> - 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 %> +> + 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/ + Alias /debian/ <%= @archive_root %>/ - 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 %> + + + UserDir disabled + # vim:set syn=apache: