diff --git a/internal/configuration/settings/openvpn.go b/internal/configuration/settings/openvpn.go index 7717ecc3..341c72c1 100644 --- a/internal/configuration/settings/openvpn.go +++ b/internal/configuration/settings/openvpn.go @@ -253,7 +253,7 @@ func (o OpenVPN) String() string { } func (o OpenVPN) toLinesNode() (node *gotree.Node) { - node = gotree.New("OpenVPN server selection settings:") + node = gotree.New("OpenVPN settings:") node.Appendf("OpenVPN version: %s", o.Version) node.Appendf("User: %s", helpers.ObfuscatePassword(o.User)) node.Appendf("Password: %s", helpers.ObfuscatePassword(o.Password)) diff --git a/internal/configuration/settings/settings_test.go b/internal/configuration/settings/settings_test.go index 1f10ddad..1462606b 100644 --- a/internal/configuration/settings/settings_test.go +++ b/internal/configuration/settings/settings_test.go @@ -29,7 +29,7 @@ func Test_Settings_String(t *testing.T) { | | └── OpenVPN server selection settings: | | ├── Protocol: UDP | | └── Private Internet Access encryption preset: strong -| └── OpenVPN server selection settings: +| └── OpenVPN settings: | ├── OpenVPN version: 2.5 | ├── User: [not set] | ├── Password: [not set] diff --git a/internal/configuration/sources/env/openvpnselection.go b/internal/configuration/sources/env/openvpnselection.go index 17280c85..07d9196b 100644 --- a/internal/configuration/sources/env/openvpnselection.go +++ b/internal/configuration/sources/env/openvpnselection.go @@ -13,6 +13,11 @@ import ( func (r *Reader) readOpenVPNSelection() ( selection settings.OpenVPNSelection, err error) { + confFile := os.Getenv("OPENVPN_CUSTOM_CONFIG") + if confFile != "" { + selection.ConfFile = &confFile + } + selection.TCP, err = r.readOpenVPNProtocol() if err != nil { return selection, err