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

fix(custom): OPENVPN_CUSTOM_CONFIG

Browse Source
This commit is contained in:
Quentin McGaw
2022-01-07 15:12:49 +00:00
parent 05f42f0cb8
commit b32c01c11a
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/configuration/settings/openvpn.go
View File

@@ -253,7 +253,7 @@ func (o OpenVPN) String() string {
} }
func (o OpenVPN) toLinesNode() (node *gotree.Node) { 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("OpenVPN version: %s", o.Version)
node.Appendf("User: %s", helpers.ObfuscatePassword(o.User)) node.Appendf("User: %s", helpers.ObfuscatePassword(o.User))
node.Appendf("Password: %s", helpers.ObfuscatePassword(o.Password)) node.Appendf("Password: %s", helpers.ObfuscatePassword(o.Password))

2
internal/configuration/settings/settings_test.go
View File

@@ -29,7 +29,7 @@ func Test_Settings_String(t *testing.T) {
| | └── OpenVPN server selection settings: | | └── OpenVPN server selection settings:
| | ├── Protocol: UDP | | ├── Protocol: UDP
| | └── Private Internet Access encryption preset: strong | | └── Private Internet Access encryption preset: strong
| └── OpenVPN server selection settings: | └── OpenVPN settings:
| ├── OpenVPN version: 2.5 | ├── OpenVPN version: 2.5
| ├── User: [not set] | ├── User: [not set]
| ├── Password: [not set] | ├── Password: [not set]

5
internal/configuration/sources/env/openvpnselection.go vendored
View File

@@ -13,6 +13,11 @@ import (
func (r *Reader) readOpenVPNSelection() ( func (r *Reader) readOpenVPNSelection() (
selection settings.OpenVPNSelection, err error) { selection settings.OpenVPNSelection, err error) {
confFile := os.Getenv("OPENVPN_CUSTOM_CONFIG")
if confFile != "" {
selection.ConfFile = &confFile
}
selection.TCP, err = r.readOpenVPNProtocol() selection.TCP, err = r.readOpenVPNProtocol()
if err != nil { if err != nil {
return selection, err return selection, err