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

Maint: openvpn process user in Openvpn settings

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2021-08-18 16:16:47 +00:00
parent bd110b960b
commit 14c3b6429b
24 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/openvpn/custom.go
View File

@@ -24,7 +24,7 @@ func (l *Loop) processCustomConfig(settings configuration.OpenVPN) (
return nil, connection, fmt.Errorf("%w: %s", errProcessCustomConfig, err)
}
lines = modifyCustomConfig(lines, l.username, settings)
lines = modifyCustomConfig(lines, settings)
connection, err = extractConnectionFromLines(lines)
if err != nil {
@@ -55,7 +55,7 @@ func readCustomConfigLines(filepath string) (
return strings.Split(string(b), "\n"), nil
}
func modifyCustomConfig(lines []string, username string,
func modifyCustomConfig(lines []string,
settings configuration.OpenVPN) (modified []string) {
// Remove some lines
for _, line := range lines {
@@ -98,7 +98,7 @@ func modifyCustomConfig(lines []string, username string,
modified = append(modified, `pull-filter ignore "ifconfig-ipv6"`)
}
if !settings.Root {
modified = append(modified, "user "+username)
modified = append(modified, "user "+settings.ProcUser)
}
return modified