x509 vnc by default

2025-12-13 01:30:31 +08:00 · 2022-03-27 23:01:45 +03:00 · 2022-03-27 23:01:45 +03:00 · 92ebe93bac
commit 92ebe93bac
parent 056f069346
18 changed files with 2 additions and 118 deletions
--- a/configs/kvmd/main/v0-hdmi-rpi.yaml
+++ b/configs/kvmd/main/v0-hdmi-rpi.yaml
@ -44,11 +44,3 @@ kvmd:
            - "--process-name-prefix={process_name_prefix}"
            - "--notify-parent"
            - "--no-log-colors"
-
-
-vnc:
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v0-hdmi-rpi2.yaml
+++ b/configs/kvmd/main/v0-hdmi-rpi2.yaml
@ -44,11 +44,3 @@ kvmd:
            - "--process-name-prefix={process_name_prefix}"
            - "--notify-parent"
            - "--no-log-colors"
-
-
-vnc:
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v0-hdmi-rpi3.yaml
+++ b/configs/kvmd/main/v0-hdmi-rpi3.yaml
@ -52,9 +52,3 @@ vnc:
    memsink:
        jpeg:
            sink: "kvmd::ustreamer::jpeg"
-
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v0-hdmi-zero2w.yaml
+++ b/configs/kvmd/main/v0-hdmi-zero2w.yaml
@ -60,9 +60,3 @@ vnc:
            sink: "kvmd::ustreamer::jpeg"
        h264:
            sink: "kvmd::ustreamer::h264"
-
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v0-hdmi-zerow.yaml
+++ b/configs/kvmd/main/v0-hdmi-zerow.yaml
@ -45,11 +45,3 @@ kvmd:
            - "--process-name-prefix={process_name_prefix}"
            - "--notify-parent"
            - "--no-log-colors"
-
-
-vnc:
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v0-hdmiusb-rpi.yaml
+++ b/configs/kvmd/main/v0-hdmiusb-rpi.yaml
@ -56,11 +56,3 @@ kvmd:
            - "--process-name-prefix={process_name_prefix}"
            - "--notify-parent"
            - "--no-log-colors"
-
-
-vnc:
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v0-hdmiusb-rpi2.yaml
+++ b/configs/kvmd/main/v0-hdmiusb-rpi2.yaml
@ -56,11 +56,3 @@ kvmd:
            - "--process-name-prefix={process_name_prefix}"
            - "--notify-parent"
            - "--no-log-colors"
-
-
-vnc:
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v0-hdmiusb-rpi3.yaml
+++ b/configs/kvmd/main/v0-hdmiusb-rpi3.yaml
@ -64,9 +64,3 @@ vnc:
    memsink:
        jpeg:
            sink: "kvmd::ustreamer::jpeg"
-
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v0-hdmiusb-zero2w.yaml
+++ b/configs/kvmd/main/v0-hdmiusb-zero2w.yaml
@ -64,9 +64,3 @@ vnc:
    memsink:
        jpeg:
            sink: "kvmd::ustreamer::jpeg"
-
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v0-hdmiusb-zerow.yaml
+++ b/configs/kvmd/main/v0-hdmiusb-zerow.yaml
@ -56,11 +56,3 @@ kvmd:
            - "--process-name-prefix={process_name_prefix}"
            - "--notify-parent"
            - "--no-log-colors"
-
-
-vnc:
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v2-hdmi-rpi3.yaml
+++ b/configs/kvmd/main/v2-hdmi-rpi3.yaml
@ -54,9 +54,3 @@ vnc:
    memsink:
        jpeg:
            sink: "kvmd::ustreamer::jpeg"
-
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v2-hdmi-rpi4.yaml
+++ b/configs/kvmd/main/v2-hdmi-rpi4.yaml
@ -62,9 +62,3 @@ vnc:
            sink: "kvmd::ustreamer::jpeg"
        h264:
            sink: "kvmd::ustreamer::h264"
-
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v2-hdmi-zero2w.yaml
+++ b/configs/kvmd/main/v2-hdmi-zero2w.yaml
@ -62,9 +62,3 @@ vnc:
            sink: "kvmd::ustreamer::jpeg"
        h264:
            sink: "kvmd::ustreamer::h264"
-
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v2-hdmi-zerow.yaml
+++ b/configs/kvmd/main/v2-hdmi-zerow.yaml
@ -47,11 +47,3 @@ kvmd:
            - "--process-name-prefix={process_name_prefix}"
            - "--notify-parent"
            - "--no-log-colors"
-
-
-vnc:
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v2-hdmiusb-generic.yaml
+++ b/configs/kvmd/main/v2-hdmiusb-generic.yaml
@ -62,9 +62,3 @@ vnc:
    memsink:
        jpeg:
            sink: "kvmd::ustreamer::jpeg"
-
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v2-hdmiusb-rpi4.yaml
+++ b/configs/kvmd/main/v2-hdmiusb-rpi4.yaml
@ -66,9 +66,3 @@ vnc:
    memsink:
        jpeg:
            sink: "kvmd::ustreamer::jpeg"
-
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/configs/kvmd/main/v3-hdmi-rpi4.yaml
+++ b/configs/kvmd/main/v3-hdmi-rpi4.yaml
@ -75,9 +75,3 @@ vnc:
            sink: "kvmd::ustreamer::jpeg"
        h264:
            sink: "kvmd::ustreamer::h264"
-
-    server:
-        tls:
-            x509:
-                cert: /etc/kvmd/vnc/ssl/server.crt
-                key: /etc/kvmd/vnc/ssl/server.key
--- a/kvmd/apps/init.py
+++ b/kvmd/apps/init.py
@ -633,8 +633,8 @@ def _get_config_scheme() -> Dict:
                    "ciphers": Option("ALL:@SECLEVEL=0", type=valid_ssl_ciphers, if_empty=""),
                    "timeout": Option(30.0, type=valid_float_f01),
                    "x509": {
-                        "cert": Option("", type=valid_abs_file, if_empty=""),
-                        "key":  Option("", type=valid_abs_file, if_empty=""),
+                        "cert": Option("/etc/kvmd/vnc/ssl/server.crt", type=valid_abs_file, if_empty=""),
+                        "key":  Option("/etc/kvmd/vnc/ssl/server.key", type=valid_abs_file, if_empty=""),
                    },
                },
            },