X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.ports.debian.org.erb;h=1479916cd6e29f4c7c72135dcf7d34512d7bea49;hb=a9b74cf4ae86eafe8b17f05266203f46ad587d44;hp=d7cd67fbff634e7cbbe37ffe9df7167818fa1c25;hpb=11ce678abbc8ed8f1a51489d1034238d633a2a9d;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 d7cd67fbf..1479916cd 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,13 +15,12 @@
 
 	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>
+	Alias /debian-ports-cd <%= @archive_cd_root %>
+	<Directory <%= @archive_cd_root %>>
 		Require all granted
-		IndexOptions NameWidth=*
 		Options +Indexes
 		Options +FollowSymLinks
 	</Directory>