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

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

diff --git a/Dockerfile b/Dockerfile
index d95fb01c..2f0acff6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -94,7 +94,7 @@ ENV VPN_SERVICE_PROVIDER=pia \
     # VPN server filtering
     REGION= \
     SERVER_COUNTRIES= \
-    CITY= \
+    SERVER_CITIES= \
     SERVER_HOSTNAME= \
     # # Mullvad only:
     ISP= \
diff --git a/internal/configuration/sources/env/serverselection.go b/internal/configuration/sources/env/serverselection.go
index adcad733..89d52399 100644
--- a/internal/configuration/sources/env/serverselection.go
+++ b/internal/configuration/sources/env/serverselection.go
@@ -36,7 +36,10 @@ func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
 	}
 
 	ss.Regions = envToCSV("REGION")
-	ss.Cities = envToCSV("CITY")
+
+	_, citiesCSV := r.getEnvWithRetro("SERVER_CITIES", "CITY")
+	ss.Cities = lowerAndSplit(citiesCSV)
+
 	ss.ISPs = envToCSV("ISP")
 	ss.Hostnames = envToCSV("SERVER_HOSTNAME")
 	ss.Names = envToCSV("SERVER_NAME")