From ae9b3279c339ff1ae78f6866bfe3e64f417a31da Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Sat, 5 Feb 2022 22:38:03 +0000
Subject: [PATCH] chore(env):
 `PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET` variable - With
 retro-compatibility with `PIA_ENCRYPTION` and `ENCRYPTION`

---
 Dockerfile                                    | 2 +-
 internal/configuration/sources/env/openvpn.go | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f57cda2e..8e4faec3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -100,7 +100,7 @@ ENV VPN_SERVICE_PROVIDER=pia \
     ISP= \
     OWNED_ONLY=no \
     # # Private Internet Access only:
-    PIA_ENCRYPTION= \
+    PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET= \
     PORT_FORWARDING=off \
     PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \
     # # Cyberghost only:
diff --git a/internal/configuration/sources/env/openvpn.go b/internal/configuration/sources/env/openvpn.go
index 38b2429c..35e2e80e 100644
--- a/internal/configuration/sources/env/openvpn.go
+++ b/internal/configuration/sources/env/openvpn.go
@@ -94,7 +94,9 @@ func readBase64OrNil(envKey string) (valueOrNil *string, err error) {
 }
 
 func (r *Reader) readPIAEncryptionPreset() (presetPtr *string) {
-	_, preset := r.getEnvWithRetro("PIA_ENCRYPTION", "ENCRYPTION")
+	_, preset := r.getEnvWithRetro(
+		"PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET",
+		"PIA_ENCRYPTION", "ENCRYPTION")
 	if preset != "" {
 		return &preset
 	}