chore(settings): refactor settings processing (#756)

- Better settings tree structure logged using `qdm12/gotree`
- Read settings from environment variables, then files, then secret files
- Settings methods to default them, merge them and override them
- `DNS_PLAINTEXT_ADDRESS` default changed to `127.0.0.1` to use DoT. Warning added if set to something else.
- `HTTPPROXY_LISTENING_ADDRESS` instead of `HTTPPROXY_PORT` (with retro-compatibility)
This commit is contained in:
Quentin McGaw
2022-01-06 06:40:23 -05:00
committed by GitHub
parent 46738b2934
commit 7d824a5179
275 changed files with 7167 additions and 6328 deletions

View File

@@ -4,21 +4,23 @@ import (
"errors"
"fmt"
"github.com/qdm12/gluetun/internal/configuration"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/constants"
)
func getPort(openvpnSelection configuration.OpenVPNSelection) (
func getPort(openvpnSelection settings.OpenVPNSelection) (
port uint16, err error) {
if openvpnSelection.CustomPort == 0 {
return getDefaultPort(openvpnSelection.TCP, openvpnSelection.EncPreset), nil
customPort := *openvpnSelection.CustomPort
tcp := *openvpnSelection.TCP
if customPort == 0 {
return getDefaultPort(tcp, *openvpnSelection.PIAEncPreset), nil
}
if err := checkPort(openvpnSelection.CustomPort, openvpnSelection.TCP); err != nil {
if err := checkPort(customPort, tcp); err != nil {
return 0, err
}
return openvpnSelection.CustomPort, nil
return customPort, nil
}
func getDefaultPort(tcp bool, encryptionPreset string) (port uint16) {