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

chore(provider): rename all BuildConf to OpenVPNConfig

Browse Source
This commit is contained in:
Quentin McGaw
2022-05-27 22:04:14 +00:00
parent d9dfb81cb4
commit 991d75a1d0
24 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/cli/openvpnconfig.go
View File

@@ -42,7 +42,7 @@ func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, source sources.Source) e
return err
}
lines := providerConf.BuildConf(connection, allSettings.VPN.OpenVPN)
lines := providerConf.OpenVPNConfig(connection, allSettings.VPN.OpenVPN)
fmt.Println(strings.Join(lines, "\n"))
return nil

2
internal/provider/custom/openvpnconf.go
View File

@@ -14,7 +14,7 @@ import (
var ErrExtractData = errors.New("failed extracting information from custom configuration file")
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
lines, _, err := p.extractor.Data(*settings.ConfFile)
if err != nil {

2
internal/provider/cyberghost/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

2
internal/provider/expressvpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

2
internal/provider/fastestvpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

2
internal/provider/hidemyass/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

2
internal/provider/ipvanish/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
providerSettings := utils.OpenVPNProviderSettings{
AuthUserPass: true,

2
internal/provider/ivpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

2
internal/provider/mullvad/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

2
internal/provider/nordvpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

2
internal/provider/perfectprivacy/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

2
internal/provider/privado/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

2
internal/provider/privateinternetaccess/openvpnconf.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
providerSettings := utils.OpenVPNProviderSettings{
RemoteCertTLS: true,

2
internal/provider/privatevpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
providerSettings := utils.OpenVPNProviderSettings{
RemoteCertTLS: true,

2
internal/provider/protonvpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

2
internal/provider/provider.go
View File

@@ -38,7 +38,7 @@ import (
// Provider contains methods to read and modify the openvpn configuration to connect as a client.
type Provider interface {
GetConnection(selection settings.ServerSelection) (connection models.Connection, err error)
BuildConf(connection models.Connection, settings settings.OpenVPN) (lines []string)
OpenVPNConfig(connection models.Connection, settings settings.OpenVPN) (lines []string)
PortForwarder
}

2
internal/provider/purevpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
providerSettings := utils.OpenVPNProviderSettings{
RemoteCertTLS: true,

2
internal/provider/surfshark/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

2
internal/provider/torguard/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
providerSettings := utils.OpenVPNProviderSettings{
RemoteCertTLS: true,

2
internal/provider/vpnunlimited/openvpnconf.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
providerSettings := utils.OpenVPNProviderSettings{
RemoteCertTLS: true,

2
internal/provider/vyprvpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
//nolint:gomnd
providerSettings := utils.OpenVPNProviderSettings{

2
internal/provider/wevpn/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
providerSettings := utils.OpenVPNProviderSettings{
RemoteCertTLS: true,

2
internal/provider/windscribe/openvpnconf.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Provider) BuildConf(connection models.Connection,
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
providerSettings := utils.OpenVPNProviderSettings{
RemoteCertTLS: true,

2
internal/vpn/openvpn.go
View File

@@ -22,7 +22,7 @@ func setupOpenVPN(ctx context.Context, fw firewall.VPNConnectionSetter,
return nil, "", fmt.Errorf("failed finding a valid server connection: %w", err)
}
lines := providerConf.BuildConf(connection, settings.OpenVPN)
lines := providerConf.OpenVPNConfig(connection, settings.OpenVPN)
if err := openvpnConf.WriteConfig(lines); err != nil {
return nil, "", fmt.Errorf("failed writing configuration to file: %w", err)