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

Move provider settings in openvpn settings

Browse Source
This commit is contained in:
Quentin McGaw
2020-07-05 20:05:38 +00:00
parent a4b0e0ff86
commit 18e99d07d0
3 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/gluetun/main.go
View File

@@ -135,7 +135,7 @@ func _main(background context.Context, args []string) int {
waiter := command.NewWaiter()
connections, err := providerConf.GetOpenVPNConnections(allSettings.Provider.ServerSelection)
connections, err := providerConf.GetOpenVPNConnections(allSettings.OpenVPN.Provider.ServerSelection)
fatalOnError(err)
err = providerConf.BuildConf(
connections,
@@ -145,7 +145,7 @@ func _main(background context.Context, args []string) int {
allSettings.OpenVPN.Root,
allSettings.OpenVPN.Cipher,
allSettings.OpenVPN.Auth,
allSettings.Provider.ExtraConfigOptions,
allSettings.OpenVPN.Provider.ExtraConfigOptions,
)
fatalOnError(err)
@@ -265,9 +265,9 @@ func _main(background context.Context, args []string) int {
logger.Error(err)
exitStatus = 1
}
if allSettings.Provider.PortForwarding.Enabled {
logger.Info("Clearing forwarded port status file %s", allSettings.Provider.PortForwarding.Filepath)
if err := fileManager.Remove(string(allSettings.Provider.PortForwarding.Filepath)); err != nil {
if allSettings.OpenVPN.Provider.PortForwarding.Enabled {
logger.Info("Clearing forwarded port status file %s", allSettings.OpenVPN.Provider.PortForwarding.Filepath)
if err := fileManager.Remove(string(allSettings.OpenVPN.Provider.PortForwarding.Filepath)); err != nil {
logger.Error(err)
exitStatus = 1
}
@@ -381,9 +381,9 @@ func onConnected(allSettings settings.Settings,
routingConf routing.Routing, defaultInterface string,
providerConf provider.Provider,
) {
if allSettings.Provider.PortForwarding.Enabled {
if allSettings.OpenVPN.Provider.PortForwarding.Enabled {
time.AfterFunc(5*time.Second, func() {
setupPortForwarding(logger, providerConf, allSettings.Provider.PortForwarding.Filepath, allSettings.System.UID, allSettings.System.GID)
setupPortForwarding(logger, providerConf, allSettings.OpenVPN.Provider.PortForwarding.Filepath, allSettings.System.UID, allSettings.System.GID)
})
}