From a69c45696568c353ce97a86c5716a6b55fb6f800 Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Sat, 5 Feb 2022 23:20:17 +0000
Subject: [PATCH] chore(env): `SERVER_HOSTNAMES` variable - With
 retro-compatibility with `SERVER_HOSTNAME`

---
 Dockerfile                                            | 2 +-
 internal/configuration/sources/env/serverselection.go | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 99de23c2..29afe5b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -95,7 +95,7 @@ ENV VPN_SERVICE_PROVIDER=pia \
     SERVER_REGIONS= \
     SERVER_COUNTRIES= \
     SERVER_CITIES= \
-    SERVER_HOSTNAME= \
+    SERVER_HOSTNAMES= \
     # # Mullvad only:
     ISP= \
     OWNED_ONLY=no \
diff --git a/internal/configuration/sources/env/serverselection.go b/internal/configuration/sources/env/serverselection.go
index 1d82b75a..2d1aa445 100644
--- a/internal/configuration/sources/env/serverselection.go
+++ b/internal/configuration/sources/env/serverselection.go
@@ -42,7 +42,10 @@ func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
 	ss.Cities = lowerAndSplit(citiesCSV)
 
 	ss.ISPs = envToCSV("ISP")
-	ss.Hostnames = envToCSV("SERVER_HOSTNAME")
+
+	_, hostnamesCSV := r.getEnvWithRetro("SERVER_HOSTNAMES", "SERVER_HOSTNAME")
+	ss.Hostnames = lowerAndSplit(hostnamesCSV)
+
 	ss.Names = envToCSV("SERVER_NAME")
 
 	if csv := os.Getenv("SERVER_NUMBER"); csv != "" {