f807f756eb
- Retro-compatibility: `OPENVPN_CUSTOM_CONFIG` set implies `VPNSP=custom` - Change: `up` and `down` options are not filtered out - Change: `OPENVPN_INTERFACE` overrides the network interface defined in the configuration file - Change: `PORT` overrides any port found in the configuration file - Feat: config file is read when building the OpenVPN configuration, so it's effectively reloaded on VPN restarts - Feat: extract values from custom file at start to log out valid settings - Maint: `internal/openvpn/extract` package instead of `internal/openvpn/custom` package - Maint: All providers' `BuildConf` method return an error - Maint: rename `CustomConfig` to `ConfFile` in Settings structures
45 lines
1.1 KiB
Go
45 lines
1.1 KiB
Go
package cli
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/qdm12/gluetun/internal/configuration"
|
|
"github.com/qdm12/gluetun/internal/constants"
|
|
"github.com/qdm12/gluetun/internal/provider"
|
|
"github.com/qdm12/gluetun/internal/storage"
|
|
"github.com/qdm12/golibs/logging"
|
|
"github.com/qdm12/golibs/params"
|
|
)
|
|
|
|
type OpenvpnConfigMaker interface {
|
|
OpenvpnConfig(logger logging.Logger, env params.Interface) error
|
|
}
|
|
|
|
func (c *CLI) OpenvpnConfig(logger logging.Logger, env params.Interface) error {
|
|
storage, err := storage.New(logger, constants.ServersData)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
allServers := storage.GetServers()
|
|
|
|
var allSettings configuration.Settings
|
|
err = allSettings.Read(env, allServers, logger)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
providerConf := provider.New(allSettings.VPN.Provider.Name, allServers, time.Now)
|
|
connection, err := providerConf.GetConnection(allSettings.VPN.Provider.ServerSelection)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
lines, err := providerConf.BuildConf(connection, allSettings.VPN.OpenVPN)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
fmt.Println(strings.Join(lines, "\n"))
|
|
return nil
|
|
}
|