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

feat(server): HTTP_CONTROL_SERVER_PORT to HTTP_CONTROL_SERVER_ADDRESS

Browse Source
This commit is contained in:
Quentin McGaw
2022-01-27 23:15:08 +00:00
parent f3692cd47f
commit 1b585159d1
7 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
internal/configuration/sources/env/server.go vendored
View File

@@ -9,13 +9,13 @@ import (
"github.com/qdm12/govalid/port"
)
func readControlServer() (controlServer settings.ControlServer, err error) {
func (r *Reader) readControlServer() (controlServer settings.ControlServer, err error) {
controlServer.Log, err = readControlServerLog()
if err != nil {
return controlServer, err
}
controlServer.Port, err = readControlServerPort()
controlServer.Address, err = r.readControlServerAddress()
if err != nil {
return controlServer, err
}
@@ -37,17 +37,23 @@ func readControlServerLog() (enabled *bool, err error) {
return &log, nil
}
func readControlServerPort() (p *uint16, err error) {
func (r *Reader) readControlServerAddress() (address *string, err error) {
// Retro-compatibility
s := os.Getenv("HTTP_CONTROL_SERVER_PORT")
if s != "" {
r.onRetroActive("HTTP_CONTROL_SERVER_PORT", "HTTP_CONTROL_SERVER_ADDRESS")
port, err := port.Validate(s)
if err != nil {
return nil, fmt.Errorf("environment variable HTTP_CONTROL_SERVER_PORT: %w", err)
}
address = new(string)
*address = ":" + fmt.Sprint(port)
return address, nil
}
s = os.Getenv("HTTP_CONTROL_SERVER_ADDRESS")
if s == "" {
return nil, nil //nolint:nilnil
}
p = new(uint16)
*p, err = port.Validate(s, port.OptionPortListening(os.Geteuid()))
if err != nil {
return nil, fmt.Errorf("environment variable HTTP_CONTROL_SERVER_PORT: %w", err)
}
return p, nil
return &s, nil
}