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:
@@ -1,23 +1,23 @@
|
||||
package hidemyass
|
||||
|
||||
import (
|
||||
"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/utils"
|
||||
)
|
||||
|
||||
func (h *HideMyAss) GetConnection(selection configuration.ServerSelection) (
|
||||
func (h *HideMyAss) GetConnection(selection settings.ServerSelection) (
|
||||
connection models.Connection, err error) {
|
||||
var port uint16 = 553
|
||||
protocol := constants.UDP
|
||||
if selection.OpenVPN.TCP {
|
||||
if *selection.OpenVPN.TCP {
|
||||
protocol = constants.TCP
|
||||
port = 8080
|
||||
}
|
||||
|
||||
if selection.OpenVPN.CustomPort > 0 {
|
||||
port = selection.OpenVPN.CustomPort
|
||||
if *selection.OpenVPN.CustomPort > 0 {
|
||||
port = *selection.OpenVPN.CustomPort
|
||||
}
|
||||
|
||||
servers, err := h.filterServers(selection)
|
||||
|
||||
Reference in New Issue
Block a user