x509 vnc by default

This commit is contained in:
Maxim Devaev 2022-03-27 23:01:45 +03:00
parent 056f069346
commit 92ebe93bac
18 changed files with 2 additions and 118 deletions

View File

@ -44,11 +44,3 @@ kvmd:
- "--process-name-prefix={process_name_prefix}" - "--process-name-prefix={process_name_prefix}"
- "--notify-parent" - "--notify-parent"
- "--no-log-colors" - "--no-log-colors"
vnc:
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -44,11 +44,3 @@ kvmd:
- "--process-name-prefix={process_name_prefix}" - "--process-name-prefix={process_name_prefix}"
- "--notify-parent" - "--notify-parent"
- "--no-log-colors" - "--no-log-colors"
vnc:
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -52,9 +52,3 @@ vnc:
memsink: memsink:
jpeg: jpeg:
sink: "kvmd::ustreamer::jpeg" sink: "kvmd::ustreamer::jpeg"
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -60,9 +60,3 @@ vnc:
sink: "kvmd::ustreamer::jpeg" sink: "kvmd::ustreamer::jpeg"
h264: h264:
sink: "kvmd::ustreamer::h264" sink: "kvmd::ustreamer::h264"
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -45,11 +45,3 @@ kvmd:
- "--process-name-prefix={process_name_prefix}" - "--process-name-prefix={process_name_prefix}"
- "--notify-parent" - "--notify-parent"
- "--no-log-colors" - "--no-log-colors"
vnc:
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -56,11 +56,3 @@ kvmd:
- "--process-name-prefix={process_name_prefix}" - "--process-name-prefix={process_name_prefix}"
- "--notify-parent" - "--notify-parent"
- "--no-log-colors" - "--no-log-colors"
vnc:
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -56,11 +56,3 @@ kvmd:
- "--process-name-prefix={process_name_prefix}" - "--process-name-prefix={process_name_prefix}"
- "--notify-parent" - "--notify-parent"
- "--no-log-colors" - "--no-log-colors"
vnc:
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -64,9 +64,3 @@ vnc:
memsink: memsink:
jpeg: jpeg:
sink: "kvmd::ustreamer::jpeg" sink: "kvmd::ustreamer::jpeg"
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -64,9 +64,3 @@ vnc:
memsink: memsink:
jpeg: jpeg:
sink: "kvmd::ustreamer::jpeg" sink: "kvmd::ustreamer::jpeg"
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -56,11 +56,3 @@ kvmd:
- "--process-name-prefix={process_name_prefix}" - "--process-name-prefix={process_name_prefix}"
- "--notify-parent" - "--notify-parent"
- "--no-log-colors" - "--no-log-colors"
vnc:
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -54,9 +54,3 @@ vnc:
memsink: memsink:
jpeg: jpeg:
sink: "kvmd::ustreamer::jpeg" sink: "kvmd::ustreamer::jpeg"
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -62,9 +62,3 @@ vnc:
sink: "kvmd::ustreamer::jpeg" sink: "kvmd::ustreamer::jpeg"
h264: h264:
sink: "kvmd::ustreamer::h264" sink: "kvmd::ustreamer::h264"
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -62,9 +62,3 @@ vnc:
sink: "kvmd::ustreamer::jpeg" sink: "kvmd::ustreamer::jpeg"
h264: h264:
sink: "kvmd::ustreamer::h264" sink: "kvmd::ustreamer::h264"
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -47,11 +47,3 @@ kvmd:
- "--process-name-prefix={process_name_prefix}" - "--process-name-prefix={process_name_prefix}"
- "--notify-parent" - "--notify-parent"
- "--no-log-colors" - "--no-log-colors"
vnc:
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -62,9 +62,3 @@ vnc:
memsink: memsink:
jpeg: jpeg:
sink: "kvmd::ustreamer::jpeg" sink: "kvmd::ustreamer::jpeg"
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -66,9 +66,3 @@ vnc:
memsink: memsink:
jpeg: jpeg:
sink: "kvmd::ustreamer::jpeg" sink: "kvmd::ustreamer::jpeg"
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -75,9 +75,3 @@ vnc:
sink: "kvmd::ustreamer::jpeg" sink: "kvmd::ustreamer::jpeg"
h264: h264:
sink: "kvmd::ustreamer::h264" sink: "kvmd::ustreamer::h264"
server:
tls:
x509:
cert: /etc/kvmd/vnc/ssl/server.crt
key: /etc/kvmd/vnc/ssl/server.key

View File

@ -633,8 +633,8 @@ def _get_config_scheme() -> Dict:
"ciphers": Option("ALL:@SECLEVEL=0", type=valid_ssl_ciphers, if_empty=""), "ciphers": Option("ALL:@SECLEVEL=0", type=valid_ssl_ciphers, if_empty=""),
"timeout": Option(30.0, type=valid_float_f01), "timeout": Option(30.0, type=valid_float_f01),
"x509": { "x509": {
"cert": Option("", type=valid_abs_file, if_empty=""), "cert": Option("/etc/kvmd/vnc/ssl/server.crt", type=valid_abs_file, if_empty=""),
"key": Option("", type=valid_abs_file, if_empty=""), "key": Option("/etc/kvmd/vnc/ssl/server.key", type=valid_abs_file, if_empty=""),
}, },
}, },
}, },