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

Change: Use SERVER_HOSTNAME instead of HOSTNAME

Browse Source
This commit is contained in:
Quentin McGaw
2020-12-31 21:50:28 +00:00
parent 02cde5f50b
commit d713782fe1
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -63,7 +63,7 @@ ENV VPNSP=pia \
# Mullvad, PureVPN, Windscribe only # Mullvad, PureVPN, Windscribe only
CITY= \ CITY= \
# Windscribe only # Windscribe only
HOSTNAME= \ SERVER_HOSTNAME= \
# Mullvad only # Mullvad only
ISP= \ ISP= \
OWNED=no \ OWNED=no \

7
internal/params/privado.go
View File

@@ -2,10 +2,13 @@ package params
import ( import (
"github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/gluetun/internal/constants"
libparams "github.com/qdm12/golibs/params"
) )
// GetPrivadoHostnames obtains the hostnames for the Privado server from the // GetPrivadoHostnames obtains the hostnames for the Privado server from the
// environment variable HOSTNAME. // environment variable SERVER_HOSTNAME.
func (r *reader) GetPrivadoHostnames() (hosts []string, err error) { func (r *reader) GetPrivadoHostnames() (hosts []string, err error) {
return r.envParams.GetCSVInPossibilities("HOSTNAME", constants.PrivadoHostnameChoices()) return r.envParams.GetCSVInPossibilities("SERVER_HOSTNAME",
constants.PrivadoHostnameChoices(),
libparams.RetroKeys([]string{"HOSTNAME"}, r.onRetroActive))
} }

7
internal/params/windscribe.go
View File

@@ -21,9 +21,12 @@ func (r *reader) GetWindscribeCities() (cities []string, err error) {
} }
// GetWindscribeHostnames obtains the hostnames for the Windscribe servers from the // GetWindscribeHostnames obtains the hostnames for the Windscribe servers from the
// environment variable HOSTNAME. // environment variable SERVER_HOSTNAME.
func (r *reader) GetWindscribeHostnames() (hostnames []string, err error) { func (r *reader) GetWindscribeHostnames() (hostnames []string, err error) {
return r.envParams.GetCSVInPossibilities("HOSTNAME", constants.WindscribeHostnameChoices()) return r.envParams.GetCSVInPossibilities("SERVER_HOSTNAME",
constants.WindscribeHostnameChoices(),
libparams.RetroKeys([]string{"HOSTNAME"}, r.onRetroActive),
)
} }
// GetWindscribePort obtains the port to reach the Windscribe server on from the // GetWindscribePort obtains the port to reach the Windscribe server on from the