X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.ports.debian.org.erb;h=458a83e4bff087e5d45e1728f7fc9fa2ed19b52c;hb=0578c547ab8910fbec58d3c9ac68780d3df316b8;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..458a83e4b 100644
--- a/modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb
@@ -4,22 +4,29 @@
 ##
 
 <VirtualHost <%= vhost_listen %> >
-        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 %>
 
-        RedirectMatch "^/$" /debian-ports/
-        Alias /debian-ports /srv/mirrors/debian-ports
+	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/
 
-        <Directory /srv/mirrors/debian-ports>
-                Require all granted
-                IndexOptions NameWidth=* +SuppressDescription
-                Options +Indexes
-                Options +FollowSymLinks
-        </Directory>
-</VirtualHost>
+	Alias /debian-ports /srv/mirrors/debian-ports
+	Use ftp-archive /srv/mirrors/debian-ports
 
+	Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
+	<Directory /srv/mirrors/debian-ports-cd>
+		Require all granted
+		Options +Indexes
+		Options +FollowSymLinks
+	</Directory>
 
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
+</VirtualHost>
+# vim:set syn=apache: