From 691ade794b453ea16270fc019284b842d3cd239a Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Sat, 5 Feb 2022 23:03:27 +0000 Subject: [PATCH] chore(env): `PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING_STATUS_FILE` - With retro-compatibility with `PORT_FORWARDING_STATUS_FILE` --- Dockerfile | 2 +- internal/configuration/sources/env/portforward.go | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 45b06307..873dfcc8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -102,7 +102,7 @@ ENV VPN_SERVICE_PROVIDER=pia \ # # Private Internet Access only: PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET= \ PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING=off \ - PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \ + PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \ # # Cyberghost only: OPENVPN_CLIENTCRT_SECRETFILE=/run/secrets/openvpn_clientcrt \ OPENVPN_CLIENTKEY_SECRETFILE=/run/secrets/openvpn_clientkey \ diff --git a/internal/configuration/sources/env/portforward.go b/internal/configuration/sources/env/portforward.go index 9e51deb7..ba19bca1 100644 --- a/internal/configuration/sources/env/portforward.go +++ b/internal/configuration/sources/env/portforward.go @@ -16,7 +16,12 @@ func (r *Reader) readPortForward() ( return portForwarding, fmt.Errorf("environment variable %s: %w", key, err) } - portForwarding.Filepath = envToStringPtr("PORT_FORWARDING_STATUS_FILE") + _, value := r.getEnvWithRetro( + "PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING_STATUS_FILE", + "PORT_FORWARDING_STATUS_FILE") + if value != "" { + portForwarding.Filepath = stringPtr(value) + } return portForwarding, nil }