From: Tom Clegg <tom@curii.com>
Date: Tue, 19 Jul 2022 21:35:27 +0000 (-0400)
Subject: 17344: Fix available-port check.
X-Git-Tag: 2.5.0~115^2~6
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/84ef8710cb1c020688ff210bca965051eee9e09e

17344: Fix available-port check.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/install/init.go b/lib/install/init.go
index b48edcd4a5..2992b6677e 100644
--- a/lib/install/init.go
+++ b/lib/install/init.go
@@ -115,10 +115,15 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
 		return 1
 	}
 
-	err = initcmd.checkPort(ctx, "4440")
-	err = initcmd.checkPort(ctx, "443")
-	if initcmd.TLS == "auto" {
-		err = initcmd.checkPort(ctx, "80")
+	ports := []int{443}
+	for i := 4440; i < 4460; i++ {
+		ports = append(ports, i)
+	}
+	if initcmd.TLS == "acme" {
+		ports = append(ports, 80)
+	}
+	for _, port := range ports {
+		err = initcmd.checkPort(ctx, fmt.Sprintf("%d", port))
 		if err != nil {
 			return 1
 		}