admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(env): SERVER_CITIES variable

Browse Source 
- With retro-compatibility with `CITY`
This commit is contained in:
Quentin McGaw
2022-02-05 23:16:47 +00:00
parent d6b39e66d1
commit 7aab18d197
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -94,7 +94,7 @@ ENV VPN_SERVICE_PROVIDER=pia \
# VPN server filtering # VPN server filtering
REGION= \ REGION= \
SERVER_COUNTRIES= \ SERVER_COUNTRIES= \
CITY= \ SERVER_CITIES= \
SERVER_HOSTNAME= \ SERVER_HOSTNAME= \
# # Mullvad only: # # Mullvad only:
ISP= \ ISP= \

5
internal/configuration/sources/env/serverselection.go vendored
View File

@@ -36,7 +36,10 @@ func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
} }
ss.Regions = envToCSV("REGION") ss.Regions = envToCSV("REGION")
ss.Cities = envToCSV("CITY")
_, citiesCSV := r.getEnvWithRetro("SERVER_CITIES", "CITY")
ss.Cities = lowerAndSplit(citiesCSV)
ss.ISPs = envToCSV("ISP") ss.ISPs = envToCSV("ISP")
ss.Hostnames = envToCSV("SERVER_HOSTNAME") ss.Hostnames = envToCSV("SERVER_HOSTNAME")
ss.Names = envToCSV("SERVER_NAME") ss.Names = envToCSV("SERVER_NAME")