##
<%
- vhost_listen = [ (bind != '') ? "#{bind}:80" : "*:80", (bind6 != '') ? "#{bind6}:80" : "*:80"].uniq.join(' ')
- vhost_listen_443 = [ (bind != '') ? "#{bind}:443" : "*:443", (bind6 != '') ? "#{bind6}:443" : "*:443"].uniq.join(' ')
+ vhost_listen = [ (bind != '') ? "#{bind}" : "*", (bind6 != '') ? "#{bind6}" : "*"].uniq
+ vhost_listen_443 = [ (bind != '') ? "#{bind}:443" : "*:443", (bind6 != '') ? "[#{bind6}]:443" : "*:443"].uniq
%>
-Use common-debian-service-https-redirect "<%= vhost_listen %>" <%= syncproxy_name %>
-<Virtualhost <%= vhost_listen_443 %> >
+<%=
+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(' ') %> >
ServerName <%= syncproxy_name %>
DocumentRoot /srv/www/syncproxy.debian.org/htdocs
Use common-debian-service-ssl <%= syncproxy_name %>
Use common-ssl-HSTS
+ Use http-pkp-<%= syncproxy_name %>
<Directory /srv/www/syncproxy.debian.org/htdocs>
Require all granted
<%=
lines = []
-%w{debian debian-backports debian-debug debian-security}.each do |archive|
+%w{debian debian-debug debian-ports debian-security}.each do |archive|
varname = 'has_srv_mirrors_' + archive.gsub(/[\/-]/,'_')
if has_variable?(varname) and (eval(varname)) == 'true'
lines << " Alias /#{archive}/project/trace/ /srv/mirrors/#{archive}/project/trace/"
lines << " <Directory /srv/mirrors/#{archive}/project/trace/>"
lines << " Require all granted"
- lines << " IndexOptions NameWidth=* +SuppressDescription"
lines << " Options +Indexes"
lines << " </Directory>"
end