summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/kvmd/main/v0-hdmi-rpi.yaml8
-rw-r--r--configs/kvmd/main/v0-hdmi-rpi2.yaml8
-rw-r--r--configs/kvmd/main/v0-hdmi-rpi3.yaml6
-rw-r--r--configs/kvmd/main/v0-hdmi-zero2w.yaml6
-rw-r--r--configs/kvmd/main/v0-hdmi-zerow.yaml8
-rw-r--r--configs/kvmd/main/v0-hdmiusb-rpi.yaml8
-rw-r--r--configs/kvmd/main/v0-hdmiusb-rpi2.yaml8
-rw-r--r--configs/kvmd/main/v0-hdmiusb-rpi3.yaml6
-rw-r--r--configs/kvmd/main/v0-hdmiusb-zero2w.yaml6
-rw-r--r--configs/kvmd/main/v0-hdmiusb-zerow.yaml8
-rw-r--r--configs/kvmd/main/v2-hdmi-rpi3.yaml6
-rw-r--r--configs/kvmd/main/v2-hdmi-rpi4.yaml6
-rw-r--r--configs/kvmd/main/v2-hdmi-zero2w.yaml6
-rw-r--r--configs/kvmd/main/v2-hdmi-zerow.yaml8
-rw-r--r--configs/kvmd/main/v2-hdmiusb-generic.yaml6
-rw-r--r--configs/kvmd/main/v2-hdmiusb-rpi4.yaml6
-rw-r--r--configs/kvmd/main/v3-hdmi-rpi4.yaml6
-rw-r--r--kvmd/apps/__init__.py4
18 files changed, 2 insertions, 118 deletions
diff --git a/configs/kvmd/main/v0-hdmi-rpi.yaml b/configs/kvmd/main/v0-hdmi-rpi.yaml
index 2cba036f..1e5ef45b 100644
--- 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
diff --git a/configs/kvmd/main/v0-hdmi-rpi2.yaml b/configs/kvmd/main/v0-hdmi-rpi2.yaml
index 2cba036f..1e5ef45b 100644
--- 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
diff --git a/configs/kvmd/main/v0-hdmi-rpi3.yaml b/configs/kvmd/main/v0-hdmi-rpi3.yaml
index 1d09fbc9..2c8b58b9 100644
--- 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
diff --git a/configs/kvmd/main/v0-hdmi-zero2w.yaml b/configs/kvmd/main/v0-hdmi-zero2w.yaml
index 1a455a21..58d1e512 100644
--- 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
diff --git a/configs/kvmd/main/v0-hdmi-zerow.yaml b/configs/kvmd/main/v0-hdmi-zerow.yaml
index f3ab670c..8863741a 100644
--- 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
diff --git a/configs/kvmd/main/v0-hdmiusb-rpi.yaml b/configs/kvmd/main/v0-hdmiusb-rpi.yaml
index aee96996..b8c33043 100644
--- 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
diff --git a/configs/kvmd/main/v0-hdmiusb-rpi2.yaml b/configs/kvmd/main/v0-hdmiusb-rpi2.yaml
index aee96996..b8c33043 100644
--- 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
diff --git a/configs/kvmd/main/v0-hdmiusb-rpi3.yaml b/configs/kvmd/main/v0-hdmiusb-rpi3.yaml
index 7e18a22c..2ac74cc1 100644
--- 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
diff --git a/configs/kvmd/main/v0-hdmiusb-zero2w.yaml b/configs/kvmd/main/v0-hdmiusb-zero2w.yaml
index 7e18a22c..2ac74cc1 100644
--- 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
diff --git a/configs/kvmd/main/v0-hdmiusb-zerow.yaml b/configs/kvmd/main/v0-hdmiusb-zerow.yaml
index aee96996..b8c33043 100644
--- 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
diff --git a/configs/kvmd/main/v2-hdmi-rpi3.yaml b/configs/kvmd/main/v2-hdmi-rpi3.yaml
index 88d0f350..5bb1a626 100644
--- 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
diff --git a/configs/kvmd/main/v2-hdmi-rpi4.yaml b/configs/kvmd/main/v2-hdmi-rpi4.yaml
index 52bedc0d..a670bd6a 100644
--- 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
diff --git a/configs/kvmd/main/v2-hdmi-zero2w.yaml b/configs/kvmd/main/v2-hdmi-zero2w.yaml
index 52bedc0d..a670bd6a 100644
--- 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
diff --git a/configs/kvmd/main/v2-hdmi-zerow.yaml b/configs/kvmd/main/v2-hdmi-zerow.yaml
index b5eb5231..ad6675f5 100644
--- 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
diff --git a/configs/kvmd/main/v2-hdmiusb-generic.yaml b/configs/kvmd/main/v2-hdmiusb-generic.yaml
index 0e7159d2..c0aff7c2 100644
--- 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
diff --git a/configs/kvmd/main/v2-hdmiusb-rpi4.yaml b/configs/kvmd/main/v2-hdmiusb-rpi4.yaml
index a90d0be3..351b749f 100644
--- 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
diff --git a/configs/kvmd/main/v3-hdmi-rpi4.yaml b/configs/kvmd/main/v3-hdmi-rpi4.yaml
index ba26d12a..6f8d0609 100644
--- 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
diff --git a/kvmd/apps/__init__.py b/kvmd/apps/__init__.py
index 521c73db..77627c3f 100644
--- 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=""),
},
},
},