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=778b6cccab56fcf987f8613d1288e27574e78492;hpb=8d3ad68faaf8d0b4e555055b8eb22b42a930c0b1;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 778b6ccca..82bac2357 100644
--- a/modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb
@@ -3,7 +3,7 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<VirtualHost <%= vhost_listen %> >
+<VirtualHost <%= @vhost_listen %> >
 	ServerAdmin debian-admin@debian.org
 	ServerName ftp.ports.debian.org
 	<% if scope.function_onion_global_service_hostname(['ftp.ports.debian.org']) -%>
@@ -15,15 +15,13 @@
 
 	RedirectMatch "^/$" /debian-ports/
 
-	Alias /debian-ports /srv/mirrors/debian-ports
-	Use ftp-archive /srv/mirrors/debian-ports
+	Alias /debian-ports <%= @archive_root %>
+	Use ftp-archive <%= @archive_root %>
 
-	Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
-	<Directory /srv/mirrors/debian-ports-cd>
-		Require all granted
-		IndexOptions NameWidth=* +SuppressDescription
-		Options +Indexes
-		Options +FollowSymLinks
-	</Directory>
+	RedirectMatch "^/debian-ports-cd/.*$" https://cdimage.debian.org/cdimage/ports/
+
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
 </VirtualHost>
 # vim:set syn=apache: