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

Minor changes

Browse Source
This commit is contained in:
Quentin McGaw
2020-03-23 20:37:56 +00:00
parent 9435db8e1e
commit e334cf6c5f
5 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/main.go
View File

@@ -55,7 +55,7 @@ func main() {
dnsConf := dns.NewConfigurator(logger, client, fileManager) dnsConf := dns.NewConfigurator(logger, client, fileManager)
firewallConf := firewall.NewConfigurator(logger, fileManager) firewallConf := firewall.NewConfigurator(logger, fileManager)
piaConf := pia.NewConfigurator(client, fileManager, firewallConf, logger) piaConf := pia.NewConfigurator(client, fileManager, firewallConf, logger)
mullvadConf := mullvad.NewConfigurator(client, fileManager, logger) mullvadConf := mullvad.NewConfigurator(fileManager, logger)
tinyProxyConf := tinyproxy.NewConfigurator(fileManager, logger) tinyProxyConf := tinyproxy.NewConfigurator(fileManager, logger)
shadowsocksConf := shadowsocks.NewConfigurator(fileManager, logger) shadowsocksConf := shadowsocks.NewConfigurator(fileManager, logger)
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())

6
internal/mullvad/mullvad.go
View File

@@ -5,7 +5,6 @@ import (
"github.com/qdm12/golibs/files" "github.com/qdm12/golibs/files"
"github.com/qdm12/golibs/logging" "github.com/qdm12/golibs/logging"
"github.com/qdm12/golibs/network"
"github.com/qdm12/private-internet-access-docker/internal/models" "github.com/qdm12/private-internet-access-docker/internal/models"
) )
@@ -18,12 +17,11 @@ type Configurator interface {
} }
type configurator struct { type configurator struct {
client network.Client
fileManager files.FileManager fileManager files.FileManager
logger logging.Logger logger logging.Logger
} }
// NewConfigurator returns a new Configurator object // NewConfigurator returns a new Configurator object
func NewConfigurator(client network.Client, fileManager files.FileManager, logger logging.Logger) Configurator { func NewConfigurator(fileManager files.FileManager, logger logging.Logger) Configurator {
return &configurator{client, fileManager, logger} return &configurator{fileManager, logger}
} }

3
internal/pia/conf.go
View File

@@ -22,9 +22,6 @@ func (c *configurator) GetOpenVPNConnections(region models.PIARegion, protocol m
if len(subdomain) == 0 { if len(subdomain) == 0 {
return nil, fmt.Errorf("region %q has no associated PIA subdomain", region) return nil, fmt.Errorf("region %q has no associated PIA subdomain", region)
} }
if err != nil {
return nil, err
}
hostname := subdomain + ".privateinternetaccess.com" hostname := subdomain + ".privateinternetaccess.com"
IPs, err := c.lookupIP(hostname) IPs, err := c.lookupIP(hostname)
if err != nil { if err != nil {

1
internal/settings/mullvad.go
View File

@@ -17,7 +17,6 @@ type Mullvad struct {
} }
func (m *Mullvad) String() string { func (m *Mullvad) String() string {
settingsList := []string{ settingsList := []string{
"Mullvad settings:", "Mullvad settings:",
"User: [redacted]", "User: [redacted]",

2
internal/settings/pia.go
View File

@@ -33,6 +33,8 @@ func (p *PortForwarding) String() string {
func (p *PIA) String() string { func (p *PIA) String() string {
settingsList := []string{ settingsList := []string{
"PIA settings:", "PIA settings:",
"User: [redacted]",
"Password: [redacted]",
"Region: " + string(p.Region), "Region: " + string(p.Region),
"Encryption: " + string(p.Encryption), "Encryption: " + string(p.Encryption),
"Port forwarding: " + p.PortForwarding.String(), "Port forwarding: " + p.PortForwarding.String(),