Maint: move Openvpn package files

- Move internal/openvpn/config/*.go to internal/openvpn/
- Move internal/openvpn/setup.go to internal/vpn/openvpn.go

cmd/gluetun/main.go

@@ -22,7 +22,7 @@ import (
 	"github.com/qdm12/gluetun/internal/healthcheck"
 	"github.com/qdm12/gluetun/internal/httpproxy"
 	"github.com/qdm12/gluetun/internal/models"
-	openvpnconfig "github.com/qdm12/gluetun/internal/openvpn/config"
+	"github.com/qdm12/gluetun/internal/openvpn"
 	"github.com/qdm12/gluetun/internal/portforward"
 	"github.com/qdm12/gluetun/internal/publicip"
 	"github.com/qdm12/gluetun/internal/routing"
@@ -145,7 +145,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 	httpClient := &http.Client{Timeout: clientTimeout}
 	// Create configurators
 	alpineConf := alpine.New()
-	ovpnConf := openvpnconfig.New(
+	ovpnConf := openvpn.New(
 		logger.NewChild(logging.Settings{Prefix: "openvpn configurator: "}),
 		cmder, puid, pgid)
 	dnsCrypto := dnscrypto.New(httpClient, "", "")

internal/openvpn/auth.go

@@ -1,4 +1,4 @@
-package config
+package openvpn
 
 import (
 	"io"

internal/openvpn/config.go

@@ -1,4 +1,4 @@
-package config
+package openvpn
 
 import (
 	"os"

internal/openvpn/logs.go

@@ -1,4 +1,4 @@
-package config
+package openvpn
 
 import (
 	"strings"

internal/openvpn/logs_test.go

@@ -1,4 +1,4 @@
-package config
+package openvpn
 
 import (
 	"testing"

internal/openvpn/openvpn.go

@@ -1,4 +1,4 @@
-package config
+package openvpn
 
 import (
 	"github.com/qdm12/gluetun/internal/constants"

internal/openvpn/run.go

@@ -1,4 +1,4 @@
-package config
+package openvpn
 
 import (
 	"context"

internal/openvpn/start.go

@@ -1,4 +1,4 @@
-package config
+package openvpn
 
 import (
 	"context"

internal/openvpn/stream.go

@@ -1,4 +1,4 @@
-package config
+package openvpn
 
 import (
 	"context"

internal/openvpn/version.go

@@ -1,4 +1,4 @@
-package config
+package openvpn
 
 import (
 	"context"

internal/vpn/loop.go

@@ -10,7 +10,7 @@ import (
 	"github.com/qdm12/gluetun/internal/firewall"
 	"github.com/qdm12/gluetun/internal/loopstate"
 	"github.com/qdm12/gluetun/internal/models"
-	"github.com/qdm12/gluetun/internal/openvpn/config"
+	"github.com/qdm12/gluetun/internal/openvpn"
 	"github.com/qdm12/gluetun/internal/portforward"
 	"github.com/qdm12/gluetun/internal/publicip"
 	"github.com/qdm12/gluetun/internal/routing"
@@ -35,7 +35,7 @@ type Loop struct {
 	buildInfo   models.BuildInformation
 	versionInfo bool
 	// Configurators
-	openvpnConf config.Interface
+	openvpnConf openvpn.Interface
 	fw          firewallConfigurer
 	routing     routing.VPNGetter
 	portForward portforward.StartStopper
@@ -65,7 +65,7 @@ const (
 
 func NewLoop(vpnSettings configuration.VPN,
 	providerSettings configuration.Provider,
-	allServers models.AllServers, openvpnConf config.Interface,
+	allServers models.AllServers, openvpnConf openvpn.Interface,
 	fw firewallConfigurer, routing routing.VPNGetter,
 	portForward portforward.StartStopper,
 	publicip publicip.Looper, dnsLooper dns.Looper,

internal/vpn/openvpn.go

@@ -1,4 +1,4 @@
-package openvpn
+package vpn
 
 import (
 	"context"
@@ -8,7 +8,7 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration"
 	"github.com/qdm12/gluetun/internal/firewall"
 	"github.com/qdm12/gluetun/internal/models"
-	"github.com/qdm12/gluetun/internal/openvpn/config"
+	"github.com/qdm12/gluetun/internal/openvpn"
 	"github.com/qdm12/gluetun/internal/openvpn/custom"
 	"github.com/qdm12/gluetun/internal/provider"
 )
@@ -20,10 +20,10 @@ var (
 	errFirewall    = errors.New("failed allowing VPN connection through firewall")
 )
 
-// Setup sets OpenVPN up using the configurators and settings given.
+// setupOpenVPN sets OpenVPN up using the configurators and settings given.
 // It returns a serverName for port forwarding (PIA) and an error if it fails.
-func Setup(ctx context.Context, fw firewall.VPNConnectionSetter,
-	openvpnConf config.Interface, providerConf provider.Provider,
+func setupOpenVPN(ctx context.Context, fw firewall.VPNConnectionSetter,
+	openvpnConf openvpn.Interface, providerConf provider.Provider,
 	openVPNSettings configuration.OpenVPN, providerSettings configuration.Provider) (
 	serverName string, err error) {
 	var connection models.OpenVPNConnection

internal/vpn/run.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/qdm12/gluetun/internal/constants"
-	"github.com/qdm12/gluetun/internal/openvpn"
 	"github.com/qdm12/gluetun/internal/provider"
 )
 
@@ -27,7 +26,7 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
 
 		providerConf := provider.New(providerSettings.Name, allServers, time.Now)
 
-		serverName, err := openvpn.Setup(ctx, l.fw, l.openvpnConf, providerConf, VPNSettings.OpenVPN, providerSettings)
+		serverName, err := setupOpenVPN(ctx, l.fw, l.openvpnConf, providerConf, VPNSettings.OpenVPN, providerSettings)
 		if err != nil {
 			l.crashed(ctx, err)
 			continue