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

chore(env): SERVER_HOSTNAMES variable

Browse Source 
- With retro-compatibility with `SERVER_HOSTNAME`
This commit is contained in:
Quentin McGaw
2022-02-05 23:20:17 +00:00
parent 0e6db2f1c5
commit a69c456965
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

@@ -95,7 +95,7 @@ ENV VPN_SERVICE_PROVIDER=pia \
SERVER_REGIONS= \ SERVER_REGIONS= \
SERVER_COUNTRIES= \ SERVER_COUNTRIES= \
SERVER_CITIES= \ SERVER_CITIES= \
SERVER_HOSTNAME= \ SERVER_HOSTNAMES= \
# # Mullvad only: # # Mullvad only:
ISP= \ ISP= \
OWNED_ONLY=no \ OWNED_ONLY=no \

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

@@ -42,7 +42,10 @@ func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
ss.Cities = lowerAndSplit(citiesCSV) ss.Cities = lowerAndSplit(citiesCSV)
ss.ISPs = envToCSV("ISP") 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") ss.Names = envToCSV("SERVER_NAME")
if csv := os.Getenv("SERVER_NUMBER"); csv != "" { if csv := os.Getenv("SERVER_NUMBER"); csv != "" {