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

chore(env): simplify Cyberghost retro logic

Browse Source
This commit is contained in:
Quentin McGaw
2022-02-05 23:04:28 +00:00
parent 691ade794b
commit 3f5c72d898
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,17 +25,14 @@ func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
return ss, err return ss, err
} }
countriesCSV := os.Getenv("COUNTRY") ss.Countries = envToCSV("COUNTRY")
if vpnProvider == constants.Cyberghost && countriesCSV == "" { if vpnProvider == constants.Cyberghost && len(ss.Countries) == 0 {
// Retro-compatibility // Retro-compatibility for Cyberghost using the REGION variable
countriesCSV = os.Getenv("REGION") ss.Countries = envToCSV("REGION")
if countriesCSV != "" { if len(ss.Countries) > 0 {
r.onRetroActive("REGION", "COUNTRY") r.onRetroActive("REGION", "COUNTRY")
} }
} }
if countriesCSV != "" {
ss.Countries = lowerAndSplit(countriesCSV)
}
ss.Regions = envToCSV("REGION") ss.Regions = envToCSV("REGION")
ss.Cities = envToCSV("CITY") ss.Cities = envToCSV("CITY")