From 72661b13ecf84dac3721b9e80536dc40569f2aad Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@google.com>
Date: Tue, 26 Jun 2018 21:15:14 +0200
Subject: [PATCH] dnsd: listen on 8053 (metrics) on ipv6-net::1

---
 cmd/dnsd/dnsd.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/cmd/dnsd/dnsd.go b/cmd/dnsd/dnsd.go
index cd135e1..64511cd 100644
--- a/cmd/dnsd/dnsd.go
+++ b/cmd/dnsd/dnsd.go
@@ -34,10 +34,6 @@ func updateListeners(mux *miekgdns.ServeMux) error {
 		return err
 	}
 
-	httpListeners.ListenAndServe(hosts, func(host string) multilisten.Listener {
-		return &http.Server{Addr: net.JoinHostPort(host, "8053")}
-	})
-
 	dnsListeners.ListenAndServe(hosts, func(host string) multilisten.Listener {
 		return &listenerAdapter{&miekgdns.Server{
 			Addr:    net.JoinHostPort(host, "53"),
@@ -45,6 +41,15 @@ func updateListeners(mux *miekgdns.ServeMux) error {
 			Handler: mux,
 		}}
 	})
+
+	if net1, err := multilisten.IPv6Net1("/perm"); err == nil {
+		hosts = append(hosts, net1)
+	}
+
+	httpListeners.ListenAndServe(hosts, func(host string) multilisten.Listener {
+		return &http.Server{Addr: net.JoinHostPort(host, "8053")}
+	})
+
 	return nil
 }