X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Froles%2Ftemplates%2Fapache-ftp.ports.debian.org.erb;h=5a060ce203617507f360a0e47e4a9e2e8e3786c8;hb=5b1ece962a0c28fb280aac2952d44f719c097084;hp=d6328bdd467ff021df24d2e3647efa7ecfa6c3c0;hpb=65139996ecd9fed4bb7498e6ac9e73fdaa6920ac;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 d6328bdd4..5a060ce20 100644
--- a/modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb
@@ -6,20 +6,30 @@
>
ServerAdmin debian-admin@debian.org
ServerName ftp.ports.debian.org
-
- RedirectMatch "^/$" /debian-ports/
- Alias /debian-ports /srv/mirrors/debian-ports
+ <% 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
LogLevel warn
CustomLog /var/log/apache2/ftp.ports.debian.org-access.log privacy
+ RedirectMatch "^/$" /debian-ports/
+
+ Alias /debian-ports /srv/mirrors/debian-ports
Require all granted
IndexOptions NameWidth=* +SuppressDescription
Options +Indexes
Options +FollowSymLinks
-
-
+ Use ftp-archive /srv/mirrors/debian-ports
+ Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
+
+ Require all granted
+ IndexOptions NameWidth=* +SuppressDescription
+ Options +Indexes
+ Options +FollowSymLinks
+
+