diff --git a/Dockerfile b/Dockerfile index 886a5544..3e6f2457 100644 --- a/Dockerfile +++ b/Dockerfile @@ -111,6 +111,7 @@ ENV VPN_SERVICE_PROVIDER=pia \ PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING=off \ PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \ # # Cyberghost only: + OPENVPN_CERT= \ 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 413d3c41..25189bd2 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_CLIENTCRT"}, err) + err = unsetEnvKeys([]string{"OPENVPN_CLIENTKEY", "OPENVPN_CERT"}, err) }() openVPN.Version = getCleanedEnv("OPENVPN_VERSION") @@ -30,9 +30,9 @@ func (r *Reader) readOpenVPN() ( openVPN.Auth = &auth } - openVPN.ClientCrt, err = readBase64OrNil("OPENVPN_CLIENTCRT") + openVPN.ClientCrt, err = readBase64OrNil("OPENVPN_CERT") if err != nil { - return openVPN, fmt.Errorf("environment variable OPENVPN_CLIENTCRT: %w", err) + return openVPN, fmt.Errorf("environment variable OPENVPN_CERT: %w", err) } openVPN.ClientKey, err = readBase64OrNil("OPENVPN_CLIENTKEY")