From d93700f1821e6a63c5853d4fa0bc0562e2a96d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 17 Dec 2021 13:57:28 +0100 Subject: [PATCH] fix #3745: allow overriding TLS key location MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit when using a custom pveproxy certificate. actual handling is done in pve-manager. Signed-off-by: Fabian Grünbichler Tested-by: Stoiko Ivanov Reviewed-by: Stoiko Ivanov --- src/PVE/APIServer/Utils.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/PVE/APIServer/Utils.pm b/src/PVE/APIServer/Utils.pm index 0124f44..2ec2dad 100644 --- a/src/PVE/APIServer/Utils.pm +++ b/src/PVE/APIServer/Utils.pm @@ -21,6 +21,7 @@ sub read_proxy_config { $shcmd .= 'echo \"CIPHERS:\$CIPHERS\";'; $shcmd .= 'echo \"CIPHERSUITES:\$CIPHERSUITES\";'; $shcmd .= 'echo \"DHPARAMS:\$DHPARAMS\";'; + $shcmd .= 'echo \"TLS_KEY_FILE:\$TLS_KEY_FILE\";'; $shcmd .= 'echo \"HONOR_CIPHER_ORDER:\$HONOR_CIPHER_ORDER\";'; $shcmd .= 'echo \"COMPRESSION:\$COMPRESSION\";'; @@ -53,6 +54,8 @@ sub read_proxy_config { $res->{$key} = $value; } elsif ($key eq 'DHPARAMS') { $res->{$key} = $value; + } elsif ($key eq 'TLS_KEY_FILE') { + $res->{$key} = $value; } elsif ($key eq 'HONOR_CIPHER_ORDER' || $key eq 'COMPRESSION') { die "unknown value '$value' - use 0 or 1\n" if $value !~ m/^(0|1)$/; $res->{$key} = $value;