12 files changed, 110 insertions, 0 deletions
diff --git a/configs/kvmd/main/v0-hdmi-rpi2.yaml b/configs/kvmd/main/v0-hdmi-rpi2.yaml
index ba532e8b..c9e77162 100644
--- a/configs/kvmd/main/v0-hdmi-rpi2.yaml
+++ b/configs/kvmd/main/v0-hdmi-rpi2.yaml
@@ -53,3 +53,13 @@ kvmd:
 ipmi:
     kvmd:
         unix: /run/kvmd/kvmd.sock
+
+
+vnc:
+    keymap: /usr/share/kvmd/keymaps/en-us
+
+    kvmd:
+        unix: /run/kvmd/kvmd.sock
+
+    streamer:
+        unix: /run/kvmd/ustreamer.sock
diff --git a/configs/kvmd/main/v0-hdmi-rpi3.yaml b/configs/kvmd/main/v0-hdmi-rpi3.yaml
index ba532e8b..9901bc4e 100644
--- a/configs/kvmd/main/v0-hdmi-rpi3.yaml
+++ b/configs/kvmd/main/v0-hdmi-rpi3.yaml
@@ -53,3 +53,12 @@ kvmd:
 ipmi:
     kvmd:
         unix: /run/kvmd/kvmd.sock
+
+vnc:
+    keymap: /usr/share/kvmd/keymaps/en-us
+
+    kvmd:
+        unix: /run/kvmd/kvmd.sock
+
+    streamer:
+        unix: /run/kvmd/ustreamer.sock
diff --git a/configs/kvmd/main/v0-vga-rpi2.yaml b/configs/kvmd/main/v0-vga-rpi2.yaml
index dd8cf024..bb45a9cf 100644
--- a/configs/kvmd/main/v0-vga-rpi2.yaml
+++ b/configs/kvmd/main/v0-vga-rpi2.yaml
@@ -54,3 +54,12 @@ kvmd:
 ipmi:
     kvmd:
         unix: /run/kvmd/kvmd.sock
+
+vnc:
+    keymap: /usr/share/kvmd/keymaps/en-us
+
+    kvmd:
+        unix: /run/kvmd/kvmd.sock
+
+    streamer:
+        unix: /run/kvmd/ustreamer.sock
diff --git a/configs/kvmd/main/v0-vga-rpi3.yaml b/configs/kvmd/main/v0-vga-rpi3.yaml
index dd8cf024..bb45a9cf 100644
--- a/configs/kvmd/main/v0-vga-rpi3.yaml
+++ b/configs/kvmd/main/v0-vga-rpi3.yaml
@@ -54,3 +54,12 @@ kvmd:
 ipmi:
     kvmd:
         unix: /run/kvmd/kvmd.sock
+
+vnc:
+    keymap: /usr/share/kvmd/keymaps/en-us
+
+    kvmd:
+        unix: /run/kvmd/kvmd.sock
+
+    streamer:
+        unix: /run/kvmd/ustreamer.sock
diff --git a/configs/kvmd/main/v1-hdmi-rpi2.yaml b/configs/kvmd/main/v1-hdmi-rpi2.yaml
index b2bca70e..a8f8d5d2 100644
--- a/configs/kvmd/main/v1-hdmi-rpi2.yaml
+++ b/configs/kvmd/main/v1-hdmi-rpi2.yaml
@@ -58,3 +58,12 @@ kvmd:
 ipmi:
     kvmd:
         unix: /run/kvmd/kvmd.sock
+
+vnc:
+    keymap: /usr/share/kvmd/keymaps/en-us
+
+    kvmd:
+        unix: /run/kvmd/kvmd.sock
+
+    streamer:
+        unix: /run/kvmd/ustreamer.sock
diff --git a/configs/kvmd/main/v1-hdmi-rpi3.yaml b/configs/kvmd/main/v1-hdmi-rpi3.yaml
index b2bca70e..a8f8d5d2 100644
--- a/configs/kvmd/main/v1-hdmi-rpi3.yaml
+++ b/configs/kvmd/main/v1-hdmi-rpi3.yaml
@@ -58,3 +58,12 @@ kvmd:
 ipmi:
     kvmd:
         unix: /run/kvmd/kvmd.sock
+
+vnc:
+    keymap: /usr/share/kvmd/keymaps/en-us
+
+    kvmd:
+        unix: /run/kvmd/kvmd.sock
+
+    streamer:
+        unix: /run/kvmd/ustreamer.sock
diff --git a/configs/kvmd/main/v1-vga-rpi2.yaml b/configs/kvmd/main/v1-vga-rpi2.yaml
index 1316ac8f..c658abfb 100644
--- a/configs/kvmd/main/v1-vga-rpi2.yaml
+++ b/configs/kvmd/main/v1-vga-rpi2.yaml
@@ -62,3 +62,12 @@ kvmd:
 ipmi:
     kvmd:
         unix: /run/kvmd/kvmd.sock
+
+vnc:
+    keymap: /usr/share/kvmd/keymaps/en-us
+
+    kvmd:
+        unix: /run/kvmd/kvmd.sock
+
+    streamer:
+        unix: /run/kvmd/ustreamer.sock
diff --git a/configs/kvmd/main/v1-vga-rpi3.yaml b/configs/kvmd/main/v1-vga-rpi3.yaml
index 1316ac8f..c658abfb 100644
--- a/configs/kvmd/main/v1-vga-rpi3.yaml
+++ b/configs/kvmd/main/v1-vga-rpi3.yaml
@@ -62,3 +62,12 @@ kvmd:
 ipmi:
     kvmd:
         unix: /run/kvmd/kvmd.sock
+
+vnc:
+    keymap: /usr/share/kvmd/keymaps/en-us
+
+    kvmd:
+        unix: /run/kvmd/kvmd.sock
+
+    streamer:
+        unix: /run/kvmd/ustreamer.sock
diff --git a/configs/kvmd/main/v2-hdmi-rpi4.yaml b/configs/kvmd/main/v2-hdmi-rpi4.yaml
index 3c9dc927..c78e3726 100644
--- a/configs/kvmd/main/v2-hdmi-rpi4.yaml
+++ b/configs/kvmd/main/v2-hdmi-rpi4.yaml
@@ -55,3 +55,12 @@ kvmd:
 ipmi:
     kvmd:
         unix: /run/kvmd/kvmd.sock
+
+vnc:
+    keymap: /usr/share/kvmd/keymaps/en-us
+
+    kvmd:
+        unix: /run/kvmd/kvmd.sock
+
+    streamer:
+        unix: /run/kvmd/ustreamer.sock
diff --git a/configs/kvmd/main/v2-hdmi-zerow.yaml b/configs/kvmd/main/v2-hdmi-zerow.yaml
index 4d9cd5fd..9b23cad5 100644
--- a/configs/kvmd/main/v2-hdmi-zerow.yaml
+++ b/configs/kvmd/main/v2-hdmi-zerow.yaml
@@ -55,3 +55,12 @@ kvmd:
 ipmi:
     kvmd:
         unix: /run/kvmd/kvmd.sock
+
+vnc:
+    keymap: /usr/share/kvmd/keymaps/en-us
+
+    kvmd:
+        unix: /run/kvmd/kvmd.sock
+
+    streamer:
+        unix: /run/kvmd/ustreamer.sock
diff --git a/configs/os/services/kvmd-vnc.service b/configs/os/services/kvmd-vnc.service
new file mode 100644
index 00000000..f72fc44e
--- /dev/null
+++ b/configs/os/services/kvmd-vnc.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Pi-KVM - VNC to KVMD/Streamer proxy
+After=kvmd.service
+
+[Service]
+User=kvmd-vnc
+Group=kvmd-vnc
+Type=simple
+Restart=always
+RestartSec=3
+
+ExecStart=/usr/bin/kvmd-vnc
+TimeoutStopSec=3
+
+[Install]
+WantedBy=multi-user.target
diff --git a/configs/os/sysusers.conf b/configs/os/sysusers.conf
index 2714ae70..84c465bd 100644
--- a/configs/os/sysusers.conf
+++ b/configs/os/sysusers.conf
@@ -1,9 +1,11 @@
 g kvmd - -
 g kvmd-ipmi - -
+g kvmd-vnc - -
 g kvmd-nginx - -
 
 u kvmd - "Pi-KVM - The main daemon" -
 u kvmd-ipmi - "Pi-KVM - IPMI to KVMD proxy" -
+u kvmd-vnc - "Pi-KVM - VNC to KVMD/Streamer proxy" -
 u kvmd-nginx - "Pi-KVM - HTTP entrypoint" -
 
 m kvmd gpio
@@ -11,5 +13,6 @@ m kvmd uucp
 m kvmd systemd-journal
 
 m kvmd-ipmi kvmd
+m kvmd-vnc kvmd
 
 m kvmd-nginx kvmd