proxmox-mirrors/pve-http-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-http-server synced 2025-07-05 17:40:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #3745: allow overriding TLS key location

Browse Source 
when using a custom pveproxy certificate. actual handling is done in
pve-manager.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2021-12-17 13:57:28 +01:00 committed by Thomas Lamprecht
parent 95fde1f73d
commit d93700f182
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/PVE/APIServer/Utils.pm
View File

@ -21,6 +21,7 @@ sub read_proxy_config {
$shcmd .= 'echo \"CIPHERS:\$CIPHERS\";'; $shcmd .= 'echo \"CIPHERS:\$CIPHERS\";';
$shcmd .= 'echo \"CIPHERSUITES:\$CIPHERSUITES\";'; $shcmd .= 'echo \"CIPHERSUITES:\$CIPHERSUITES\";';
$shcmd .= 'echo \"DHPARAMS:\$DHPARAMS\";'; $shcmd .= 'echo \"DHPARAMS:\$DHPARAMS\";';
$shcmd .= 'echo \"TLS_KEY_FILE:\$TLS_KEY_FILE\";';
$shcmd .= 'echo \"HONOR_CIPHER_ORDER:\$HONOR_CIPHER_ORDER\";'; $shcmd .= 'echo \"HONOR_CIPHER_ORDER:\$HONOR_CIPHER_ORDER\";';
$shcmd .= 'echo \"COMPRESSION:\$COMPRESSION\";'; $shcmd .= 'echo \"COMPRESSION:\$COMPRESSION\";';
@ -53,6 +54,8 @@ sub read_proxy_config {
$res->{$key} = $value; $res->{$key} = $value;
} elsif ($key eq 'DHPARAMS') { } elsif ($key eq 'DHPARAMS') {
$res->{$key} = $value; $res->{$key} = $value;
} elsif ($key eq 'TLS_KEY_FILE') {
$res->{$key} = $value;
} elsif ($key eq 'HONOR_CIPHER_ORDER' || $key eq 'COMPRESSION') { } elsif ($key eq 'HONOR_CIPHER_ORDER' || $key eq 'COMPRESSION') {
die "unknown value '$value' - use 0 or 1\n" if $value !~ m/^(0|1)$/; die "unknown value '$value' - use 0 or 1\n" if $value !~ m/^(0|1)$/;
$res->{$key} = $value; $res->{$key} = $value;