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

chore(env): PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING

Browse Source 
- With retro-compatibility with `PORT_FORWARDING`
This commit is contained in:
Quentin McGaw
2022-02-05 23:02:29 +00:00
parent ae9b3279c3
commit 1693c4ed8a
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -101,7 +101,7 @@ ENV VPN_SERVICE_PROVIDER=pia \
OWNED_ONLY=no \ OWNED_ONLY=no \
# # Private Internet Access only: # # Private Internet Access only:
PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET= \ PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET= \
PORT_FORWARDING=off \ PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING=off \
PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \ PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \
# # Cyberghost only: # # Cyberghost only:
OPENVPN_CLIENTCRT_SECRETFILE=/run/secrets/openvpn_clientcrt \ OPENVPN_CLIENTCRT_SECRETFILE=/run/secrets/openvpn_clientcrt \

9
internal/configuration/sources/env/portforward.go vendored
View File

@@ -6,11 +6,14 @@ import (
"github.com/qdm12/gluetun/internal/configuration/settings" "github.com/qdm12/gluetun/internal/configuration/settings"
) )
func readPortForward() ( func (r *Reader) readPortForward() (
portForwarding settings.PortForwarding, err error) { portForwarding settings.PortForwarding, err error) {
portForwarding.Enabled, err = envToBoolPtr("PORT_FORWARDING") key, _ := r.getEnvWithRetro(
"PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING",
"PORT_FORWARDING")
portForwarding.Enabled, err = envToBoolPtr(key)
if err != nil { if err != nil {
return portForwarding, fmt.Errorf("environment variable PORT_FORWARDING: %w", err) return portForwarding, fmt.Errorf("environment variable %s: %w", key, err)
} }
portForwarding.Filepath = envToStringPtr("PORT_FORWARDING_STATUS_FILE") portForwarding.Filepath = envToStringPtr("PORT_FORWARDING_STATUS_FILE")

2
internal/configuration/sources/env/provider.go vendored
View File

@@ -21,7 +21,7 @@ func (r *Reader) readProvider(vpnType string) (provider settings.Provider, err e
return provider, fmt.Errorf("cannot read server selection settings: %w", err) return provider, fmt.Errorf("cannot read server selection settings: %w", err)
} }
provider.PortForwarding, err = readPortForward() provider.PortForwarding, err = r.readPortForward()
if err != nil { if err != nil {
return provider, fmt.Errorf("cannot read port forwarding settings: %w", err) return provider, fmt.Errorf("cannot read port forwarding settings: %w", err)
} }