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

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

diff --git a/Dockerfile b/Dockerfile
index 29afe5b2..cf92a2e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -109,7 +109,7 @@ ENV VPN_SERVICE_PROVIDER=pia \
     # # Nordvpn only:
     SERVER_NUMBER= \
     # # PIA and ProtonVPN only:
-    SERVER_NAME= \
+    SERVER_NAMES= \
     # # ProtonVPN only:
     FREE_ONLY= \
     # # Surfshark only:
diff --git a/internal/configuration/sources/env/serverselection.go b/internal/configuration/sources/env/serverselection.go
index 2d1aa445..931c358b 100644
--- a/internal/configuration/sources/env/serverselection.go
+++ b/internal/configuration/sources/env/serverselection.go
@@ -46,7 +46,8 @@ func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
 	_, hostnamesCSV := r.getEnvWithRetro("SERVER_HOSTNAMES", "SERVER_HOSTNAME")
 	ss.Hostnames = lowerAndSplit(hostnamesCSV)
 
-	ss.Names = envToCSV("SERVER_NAME")
+	_, namesCSV := r.getEnvWithRetro("SERVER_NAMES", "SERVER_NAME")
+	ss.Names = lowerAndSplit(namesCSV)
 
 	if csv := os.Getenv("SERVER_NUMBER"); csv != "" {
 		numbersStrings := strings.Split(csv, ",")