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=e4bf13bb537e388c6e63aaaf35f57b042e78c5ad;hp=a9d4058e43687b2dcb18ae5b1c9549cf5dfff0f3;hpb=b529b139a60ea8355089511737c8264185d8d074;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 a9d4058e4..82bac2357 100644
--- a/modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb
@@ -15,15 +15,10 @@
 
 	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
-		Options +Indexes
-		Options +FollowSymLinks
-	</Directory>
+	RedirectMatch "^/debian-ports-cd/.*$" https://cdimage.debian.org/cdimage/ports/
 
 	<IfModule mod_userdir.c>
 		UserDir disabled