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=8a6f86ad8e7da1d84ef781cc4415ede0247fe7ec;hp=e81cbe3085ade100c5e110ccdf7aea8b1e95b35d;hpb=f7b6fdd2d515765d88696ced52fb0e7e4dda06c0;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 e81cbe308..ab4ca5987 100644
--- a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
+++ b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
@@ -3,20 +3,11 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<%
-  vhost_listen = [ (@bind != '') ? "#{@bind}" : "*",  (@bind6 != '') ? "#{@bind6}" : "*"].uniq
-  vhost_listen_443 = [ (@bind != '') ? "#{@bind}:443" : "*:443",  (@bind6 != '') ? "[#{@bind6}]:443" : "*:443"].uniq
-%>
+<% @binds.each do |bind| -%>
+  Use common-debian-service-https-redirect "<%= bind %>" "<%= @syncproxy_name %>"
+<% end -%>
 
-<%=
-lines = []
-vhost_listen.each do |bind|
-   lines << "Use common-debian-service-https-redirect \"#{bind}\" \"#{@syncproxy_name}\""
-end
-lines.join("\n")
-
-%>
-<Virtualhost <%= vhost_listen_443.join(' ') %> >
+<Virtualhost <%= @binds.map { |bind| "#{bind}:443" }.join(' ') %> >
    ServerName <%= @syncproxy_name %>
    DocumentRoot /srv/www/syncproxy.debian.org/htdocs
 
@@ -34,10 +25,10 @@ lines.join("\n")
 <%=
 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 << "  <Directory /srv/mirrors/#{archive}/project/trace/>"
+    lines << "  Alias /#{archive}/project/trace/ #{@mirror_basedir_prefix}#{archive}/project/trace/"
+    lines << "  <Directory #{@mirror_basedir_prefix}#{archive}/project/trace/>"
     lines << "    Require all granted"
     lines << "    Options +Indexes"
     lines << "  </Directory>"