X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.debian.org.erb;h=6dda3727a446179f236b78b558da53d15f3aa1e8;hb=f7b6fdd2d515765d88696ced52fb0e7e4dda06c0;hp=339f934493d1dd6251040ea44e97c0a95ab9bacb;hpb=fbd4579fc940f349d6dfc480381b3a671c453555;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 339f93449..6dda3727a 100644 --- a/modules/roles/templates/apache-ftp.debian.org.erb +++ b/modules/roles/templates/apache-ftp.debian.org.erb @@ -3,7 +3,7 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## -> +> ServerAdmin debian-admin@debian.org ServerName ftp.debian.org ServerAlias debian.anycast-test.mirrors.debian.org @@ -14,12 +14,12 @@ ServerAlias *.debian.backend.mirrors.debian.org RedirectMatch "^/$" /debian/ - Alias /debian/ <%= archive_root %>/ + Alias /debian/ <%= @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 %> + Use ftp-archive <%= @archive_root %> UserDir disabled