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

Change: OPENVPN_CLIENTCRT -> OPENVPN_CERT

Browse Source 
- No breaking change since this was undocumented
This commit is contained in:
Quentin McGaw
2022-08-13 18:55:29 +00:00
parent 1ab74e6bb3
commit f94d4b761a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@@ -111,6 +111,7 @@ ENV VPN_SERVICE_PROVIDER=pia \
PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING=off \ PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING=off \
PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \ PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \
# # Cyberghost only: # # Cyberghost only:
OPENVPN_CERT= \
OPENVPN_CLIENTCRT_SECRETFILE=/run/secrets/openvpn_clientcrt \ OPENVPN_CLIENTCRT_SECRETFILE=/run/secrets/openvpn_clientcrt \
OPENVPN_CLIENTKEY_SECRETFILE=/run/secrets/openvpn_clientkey \ OPENVPN_CLIENTKEY_SECRETFILE=/run/secrets/openvpn_clientkey \
# # Nordvpn only: # # Nordvpn only:

6
internal/configuration/sources/env/openvpn.go vendored
View File

@@ -11,7 +11,7 @@ import (
func (r *Reader) readOpenVPN() ( func (r *Reader) readOpenVPN() (
openVPN settings.OpenVPN, err error) { openVPN settings.OpenVPN, err error) {
defer func() { defer func() {
err = unsetEnvKeys([]string{"OPENVPN_CLIENTKEY", "OPENVPN_CLIENTCRT"}, err) err = unsetEnvKeys([]string{"OPENVPN_CLIENTKEY", "OPENVPN_CERT"}, err)
}() }()
openVPN.Version = getCleanedEnv("OPENVPN_VERSION") openVPN.Version = getCleanedEnv("OPENVPN_VERSION")
@@ -30,9 +30,9 @@ func (r *Reader) readOpenVPN() (
openVPN.Auth = &auth openVPN.Auth = &auth
} }
openVPN.ClientCrt, err = readBase64OrNil("OPENVPN_CLIENTCRT") openVPN.ClientCrt, err = readBase64OrNil("OPENVPN_CERT")
if err != nil { 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") openVPN.ClientKey, err = readBase64OrNil("OPENVPN_CLIENTKEY")