From 5bcc5b38c0c58bc4c9d672a2f801bd747a935d75 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 12 Feb 2017 17:11:54 +0000
Subject: [PATCH] fix syncproxy http -> https redirect on ipv6

---
 .../syncproxy/syncproxy.debian.org-apache.erb     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
index 7da6cb55b..de01c02a5 100644
--- a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
+++ b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
@@ -4,12 +4,19 @@
 ##
 
 <%
-  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
 
-- 
2.20.1