From 652daec5090f141954d91388048877d4a2e93028 Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Sat, 13 Aug 2022 18:56:37 +0000
Subject: [PATCH] Change: `OPENVPN_CLIENTKEY` -> `OPENVPN_KEY` - No breaking
 change since this was undocumented

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

diff --git a/Dockerfile b/Dockerfile
index 3e6f2457..844f8e5b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -112,6 +112,7 @@ ENV VPN_SERVICE_PROVIDER=pia \
     PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \
     # # Cyberghost only:
     OPENVPN_CERT= \
+    OPENVPN_KEY= \
     OPENVPN_CLIENTCRT_SECRETFILE=/run/secrets/openvpn_clientcrt \
     OPENVPN_CLIENTKEY_SECRETFILE=/run/secrets/openvpn_clientkey \
     # # Nordvpn only:
diff --git a/internal/configuration/sources/env/openvpn.go b/internal/configuration/sources/env/openvpn.go
index 25189bd2..39b4cf7b 100644
--- a/internal/configuration/sources/env/openvpn.go
+++ b/internal/configuration/sources/env/openvpn.go
@@ -11,7 +11,7 @@ import (
 func (r *Reader) readOpenVPN() (
 	openVPN settings.OpenVPN, err error) {
 	defer func() {
-		err = unsetEnvKeys([]string{"OPENVPN_CLIENTKEY", "OPENVPN_CERT"}, err)
+		err = unsetEnvKeys([]string{"OPENVPN_KEY", "OPENVPN_CERT"}, err)
 	}()
 
 	openVPN.Version = getCleanedEnv("OPENVPN_VERSION")
@@ -35,9 +35,9 @@ func (r *Reader) readOpenVPN() (
 		return openVPN, fmt.Errorf("environment variable OPENVPN_CERT: %w", err)
 	}
 
-	openVPN.ClientKey, err = readBase64OrNil("OPENVPN_CLIENTKEY")
+	openVPN.ClientKey, err = readBase64OrNil("OPENVPN_KEY")
 	if err != nil {
-		return openVPN, fmt.Errorf("environment variable OPENVPN_CLIENTKEY: %w", err)
+		return openVPN, fmt.Errorf("environment variable OPENVPN_KEY: %w", err)
 	}
 
 	openVPN.PIAEncPreset = r.readPIAEncryptionPreset()