X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.ports.debian.org.erb;h=82bac2357c4c0bcedc35ab88ecd9e0438d28fd3f;hb=530a368c8a8e40d8b115989dcef7bae700099c01;hp=285d00872334152ee591e0d3647e96f9a24c5693;hpb=3e28626c0045fcd35bf02f8bddcdf5a273d0fdb2;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/templates/apache-ftp.ports.debian.org.erb b/modules/roles/templates/apache-ftp.ports.debian.org.erb index 285d00872..82bac2357 100644 --- a/modules/roles/templates/apache-ftp.ports.debian.org.erb +++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb @@ -3,32 +3,25 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## - > - ServerAdmin debian-admin@debian.org - ServerName ftp.ports.debian.org + > + ServerAdmin debian-admin@debian.org + ServerName ftp.ports.debian.org + <% if scope.function_onion_global_service_hostname(['ftp.ports.debian.org']) -%> + ServerAlias <%= scope.function_onion_global_service_hostname(['ftp.ports.debian.org']) %> + <% end %> + ErrorLog /var/log/apache2/ftp.ports.debian.org-error.log + CustomLog /var/log/apache2/ftp.ports.debian.org-access.log privacy - ErrorLog /var/log/apache2/ftp.ports.debian.org-error.log - LogLevel warn - CustomLog /var/log/apache2/ftp.ports.debian.org-access.log privacy + RedirectMatch "^/$" /debian-ports/ - RedirectMatch "^/$" /debian-ports/ + Alias /debian-ports <%= @archive_root %> + Use ftp-archive <%= @archive_root %> - Alias /debian-ports /srv/mirrors/debian-ports - - Require all granted - IndexOptions NameWidth=* +SuppressDescription - Options +Indexes - Options +FollowSymLinks - + RedirectMatch "^/debian-ports-cd/.*$" https://cdimage.debian.org/cdimage/ports/ - Alias /debian-ports-cd /srv/mirrors/debian-ports-cd - - Require all granted - IndexOptions NameWidth=* +SuppressDescription - Options +Indexes - Options +FollowSymLinks - + + UserDir disabled + - - +# vim:set syn=apache: