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:
@@ -8,7 +8,7 @@ import (
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/qdm12/gluetun/internal/configuration"
|
||||
"github.com/qdm12/gluetun/internal/configuration/settings"
|
||||
"github.com/qdm12/gluetun/internal/constants"
|
||||
"github.com/qdm12/gluetun/internal/models"
|
||||
"github.com/qdm12/gluetun/internal/provider/custom"
|
||||
@@ -37,8 +37,8 @@ import (
|
||||
|
||||
// Provider contains methods to read and modify the openvpn configuration to connect as a client.
|
||||
type Provider interface {
|
||||
GetConnection(selection configuration.ServerSelection) (connection models.Connection, err error)
|
||||
BuildConf(connection models.Connection, settings configuration.OpenVPN) (lines []string, err error)
|
||||
GetConnection(selection settings.ServerSelection) (connection models.Connection, err error)
|
||||
BuildConf(connection models.Connection, settings settings.OpenVPN) (lines []string, err error)
|
||||
PortForwarder
|
||||
}
|
||||
|
||||
@@ -96,6 +96,6 @@ func New(provider string, allServers models.AllServers, timeNow func() time.Time
|
||||
case constants.Windscribe:
|
||||
return windscribe.New(allServers.Windscribe.Servers, randSource)
|
||||
default:
|
||||
return nil // should never occur
|
||||
panic("provider " + provider + " is unknown") // should never occur
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user