X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsyncproxy%2Fsyncproxy.debian.org-apache.erb;h=ab4ca59871fd2a830a39dba5079890cfa32c6ce0;hb=b357c850f3122c4e3bd79a4f509012b2288f9c98;hp=eb59b0c8cc463354d62907a13c459434abe4e693;hpb=1671f0803c4abe0f70a42a31bdc1c1a352de8ef2;p=mirror%2Fdsa-puppet.git
diff --git a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
index eb59b0c8c..ab4ca5987 100644
--- a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
+++ b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
@@ -25,10 +25,10 @@
<%=
lines = []
%w{debian debian-debug debian-ports debian-security}.each do |archive|
- varname = 'has_srv_mirrors_' + archive.gsub(/[\/-]/,'_')
+ varname = ('has' + @mirror_basedir_prefix + archive).gsub(/[\/-]/,'_')
if has_variable?(varname) and (eval("@"+varname))
- lines << " Alias /#{archive}/project/trace/ /srv/mirrors/#{archive}/project/trace/"
- lines << " "
+ lines << " Alias /#{archive}/project/trace/ #{@mirror_basedir_prefix}#{archive}/project/trace/"
+ lines << " "
lines << " Require all granted"
lines << " Options +Indexes"
lines << " "