From 000f94d204fead43e2fe7b667b77583889cce29b Mon Sep 17 00:00:00 2001 From: mofeng-git Date: Sun, 15 Sep 2024 11:18:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9B=AE=E5=BD=95=E6=8C=82=E8=BD=BD=EF=BC=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=A4=9A=E4=BD=99=E6=96=87=E4=BB=B6=20-v=20./kvmd=5Fc?= =?UTF-8?q?onfig:/etc/kvmd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- .vscode/settings.json | 3 + build/Dockerfile | 25 ++-- {configs/kvmd => build}/init.sh | 2 + build/v2-hdmiusb-rpi4.override.yaml | 78 ------------ configs/kvmd/edid/_1080p-by-default.hex | 16 --- configs/kvmd/edid/_no-1920x1200.hex | 16 --- configs/kvmd/edid/v0.hex | 16 --- configs/kvmd/edid/v1.hex | 16 --- configs/kvmd/edid/v2.hex | 16 --- configs/kvmd/edid/v3.hex | 16 --- configs/kvmd/edid/v4mini.hex | 16 --- configs/kvmd/edid/v4plus.hex | 16 --- configs/kvmd/fan/v3-hdmi.ini | 4 - configs/kvmd/fan/v4mini-hdmi.ini | 12 -- configs/kvmd/fan/v4plus-hdmi.ini | 12 -- .../{main/v2-hdmiusb-rpi4.yaml => main.yaml} | 0 configs/kvmd/main/v0-hdmi-rpi2.yaml | 39 ------ configs/kvmd/main/v0-hdmi-rpi3.yaml | 47 ------- configs/kvmd/main/v0-hdmi-zero2w.yaml | 55 -------- configs/kvmd/main/v0-hdmiusb-rpi2.yaml | 51 -------- configs/kvmd/main/v0-hdmiusb-rpi3.yaml | 59 --------- configs/kvmd/main/v0-hdmiusb-zero2w.yaml | 59 --------- configs/kvmd/main/v1-hdmi-rpi2.yaml | 48 ------- configs/kvmd/main/v1-hdmi-rpi3.yaml | 64 ---------- configs/kvmd/main/v1-hdmi-zero2w.yaml | 64 ---------- configs/kvmd/main/v1-hdmiusb-rpi2.yaml | 60 --------- configs/kvmd/main/v1-hdmiusb-rpi3.yaml | 68 ---------- configs/kvmd/main/v1-hdmiusb-zero2w.yaml | 68 ---------- configs/kvmd/main/v2-hdmi-rpi3.yaml | 55 -------- configs/kvmd/main/v2-hdmi-rpi4.yaml | 56 --------- configs/kvmd/main/v2-hdmi-zero2w.yaml | 55 -------- configs/kvmd/main/v2-hdmiusb-generic.yaml | 59 --------- configs/kvmd/main/v3-hdmi-rpi4.yaml | 68 ---------- configs/kvmd/main/v4mini-hdmi-rpi4.yaml | 97 --------------- configs/kvmd/main/v4plus-hdmi-rpi4.yaml | 98 --------------- configs/kvmd/override.yaml | 117 ++++++++++++------ 37 files changed, 92 insertions(+), 1462 deletions(-) create mode 100644 .vscode/settings.json rename {configs/kvmd => build}/init.sh (99%) delete mode 100644 build/v2-hdmiusb-rpi4.override.yaml delete mode 100644 configs/kvmd/edid/_1080p-by-default.hex delete mode 100644 configs/kvmd/edid/_no-1920x1200.hex delete mode 100644 configs/kvmd/edid/v0.hex delete mode 100644 configs/kvmd/edid/v1.hex delete mode 100644 configs/kvmd/edid/v2.hex delete mode 100644 configs/kvmd/edid/v3.hex delete mode 100644 configs/kvmd/edid/v4mini.hex delete mode 100644 configs/kvmd/edid/v4plus.hex delete mode 100644 configs/kvmd/fan/v3-hdmi.ini delete mode 100644 configs/kvmd/fan/v4mini-hdmi.ini delete mode 100644 configs/kvmd/fan/v4plus-hdmi.ini rename configs/kvmd/{main/v2-hdmiusb-rpi4.yaml => main.yaml} (100%) delete mode 100644 configs/kvmd/main/v0-hdmi-rpi2.yaml delete mode 100644 configs/kvmd/main/v0-hdmi-rpi3.yaml delete mode 100644 configs/kvmd/main/v0-hdmi-zero2w.yaml delete mode 100644 configs/kvmd/main/v0-hdmiusb-rpi2.yaml delete mode 100644 configs/kvmd/main/v0-hdmiusb-rpi3.yaml delete mode 100644 configs/kvmd/main/v0-hdmiusb-zero2w.yaml delete mode 100644 configs/kvmd/main/v1-hdmi-rpi2.yaml delete mode 100644 configs/kvmd/main/v1-hdmi-rpi3.yaml delete mode 100644 configs/kvmd/main/v1-hdmi-zero2w.yaml delete mode 100644 configs/kvmd/main/v1-hdmiusb-rpi2.yaml delete mode 100644 configs/kvmd/main/v1-hdmiusb-rpi3.yaml delete mode 100644 configs/kvmd/main/v1-hdmiusb-zero2w.yaml delete mode 100644 configs/kvmd/main/v2-hdmi-rpi3.yaml delete mode 100644 configs/kvmd/main/v2-hdmi-rpi4.yaml delete mode 100644 configs/kvmd/main/v2-hdmi-zero2w.yaml delete mode 100644 configs/kvmd/main/v2-hdmiusb-generic.yaml delete mode 100644 configs/kvmd/main/v3-hdmi-rpi4.yaml delete mode 100644 configs/kvmd/main/v4mini-hdmi-rpi4.yaml delete mode 100644 configs/kvmd/main/v4plus-hdmi-rpi4.yaml diff --git a/.gitignore b/.gitignore index b42cc3f0..183053f1 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ *.pyc *.swp /venv/ -.vscode/settings.json +.vscode/settings.j/son +kvmd_config/ diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..9ddf6b28 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "cmake.ignoreCMakeListsMissing": true +} \ No newline at end of file diff --git a/build/Dockerfile b/build/Dockerfile index f5051b5b..ce382624 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -99,16 +99,7 @@ RUN if [ ${TARGETARCH} = arm ]; then ARCH=armhf; elif [ ${TARGETARCH} = arm64 ]; && chmod +x /usr/local/bin/ttyd \ && adduser kvmd --gecos "" --disabled-password \ && ln -sf /usr/share/tesseract-ocr/*/tessdata /usr/share/tessdata \ - && mkdir -p \ - /etc/kvmd/nginx \ - /etc/kvmd/vnc \ - /etc/kvmd/override.d\ - /etc/kvmd/hw_info/ \ - /var/lib/kvmd/msd \ - /var/lib/kvmd/pst/data \ - /opt/vc/bin \ - /run/kvmd \ - /tmp/kvmd-nginx \ + && mkdir -p /etc/kvmd/override.d /var/lib/kvmd/msd /var/lib/kvmd/pst/data /opt/vc/bin /run/kvmd /tmp/kvmd-nginx \ && touch /run/kvmd/ustreamer.sock /etc/kvmd/.docker_flag @@ -117,13 +108,11 @@ COPY extras/ /usr/share/kvmd/extras/ COPY web/ /usr/share/kvmd/web/ COPY build/platform scripts/kvmd-gencert /usr/share/kvmd/ COPY contrib/keymaps /usr/share/kvmd/keymaps -COPY kvmd/ /kvmd -COPY configs/kvmd/* /etc/kvmd/ -COPY configs/nginx/* /etc/kvmd/nginx/ -COPY configs/janus/* /etc/kvmd/janus/ -COPY configs/hw_info/* /etc/kvmd/hw_info/ -COPY build/v2-hdmiusb-rpi4.override.yaml /etc/kvmd/override.yaml -COPY configs/kvmd/main/v2-hdmiusb-rpi4.yaml /etc/kvmd/main.yaml +COPY kvmd/ build/init.sh /kvmd/ +COPY configs/kvmd/* /etc/kvmd_backup/ +COPY configs/nginx/* /etc/kvmd_backup/nginx/ +COPY configs/janus/* /etc/kvmd_backup/janus/ +COPY configs/hw_info/* /etc/kvmd_backup/hw_info/ COPY testenv/js/* /usr/share/janus/javascript/ -CMD ["/etc/kvmd/init.sh"] \ No newline at end of file +ENTRYPOINT ["/kvmd/init.sh"] \ No newline at end of file diff --git a/configs/kvmd/init.sh b/build/init.sh similarity index 99% rename from configs/kvmd/init.sh rename to build/init.sh index d3c3df08..56ae084d 100755 --- a/configs/kvmd/init.sh +++ b/build/init.sh @@ -11,6 +11,8 @@ echo -e "${GREEN}One-KVM pre-starting...${NC}" #仅首次运行，用于初始化配置文件 if [ ! -f /etc/kvmd/.init_flag ]; then + cp -r /etc/kvmd_backup/* /etc/kvmd/ + #生成 ssl 证书 和 vnc 证书 /usr/share/kvmd/kvmd-gencert --do-the-thing /usr/share/kvmd/kvmd-gencert --do-the-thing --vnc diff --git a/build/v2-hdmiusb-rpi4.override.yaml b/build/v2-hdmiusb-rpi4.override.yaml deleted file mode 100644 index c23192c3..00000000 --- a/build/v2-hdmiusb-rpi4.override.yaml +++ /dev/null @@ -1,78 +0,0 @@ -kvmd: - auth: - enabled: true - - server: - unix_mode: 0666 - - atx: - type: disabled - - hid: - type: ch9329 - device: /dev/ttyUSB0 - - msd: - type: disabled - - streamer: - resolution: - default: 1280x720 - forever: true - h264_bitrate: - default: 2000 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/video0" - - "--persistent" - - "--format=mjpeg" - - "--encoder=LIBX264-VIDEO" - - "--resolution={resolution}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--last-as-blank=0" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0666" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--h264-sink=kvmd::ustreamer::h264" - - "--h264-sink-mode=0660" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - "--h264-bitrate={h264_bitrate}" - - "--h264-gop={h264_gop}" - - "--slowdown" - -vnc: - keymap: /usr/share/kvmd/keymaps/ru - - auth: - vncauth: - enabled: true - - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" - h264: - sink: "kvmd::ustreamer::h264" - -otgnet: - commands: - post_start_cmd: - - "/bin/true" - pre_stop_cmd: - - "/bin/true" - -nginx: - http: - port: 8080 - https: - port: 4430 - - -languages: - console: zh - web: zh diff --git a/configs/kvmd/edid/_1080p-by-default.hex b/configs/kvmd/edid/_1080p-by-default.hex deleted file mode 100644 index f4238bec..00000000 --- a/configs/kvmd/edid/_1080p-by-default.hex +++ /dev/null @@ -1,16 +0,0 @@ -00FFFFFFFFFFFF0031D8717701010101 -231A010380351E780E0565A756529C27 -0F50543FED00B300A9C0950090408180 -814081C0714FEE2C80A070381A403020 -3500404421000002000000FF00434146 -45424142452020202020000000FD0032 -4B0F5211000A202020202020000000FC -0050694B564D2056330A20202020012B -020317314A049F13223E213D203C0167 -030C001000802DEE2C80A070381A4030 -203500404421000002011D007251D01E -206E2835000F282100001E0000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -000000000000000000000000000000CD diff --git a/configs/kvmd/edid/_no-1920x1200.hex b/configs/kvmd/edid/_no-1920x1200.hex deleted file mode 100644 index c89278e5..00000000 --- a/configs/kvmd/edid/_no-1920x1200.hex +++ /dev/null @@ -1,16 +0,0 @@ -00FFFFFFFFFFFF0031D8737701010101 -231A010380351E780E0565A756529C27 -0F50543FED00B300A9C0950090408180 -814081C0714F023A801871382D40582C -45000F282100001E000000FF00434146 -45424142452020202020000000FD0032 -4B0F5211000A202020202020000000FC -0050694B564D20563420506C7573012D -020320714B90041F13223E213D203C01 -67030C001000802D23097F0783010000 -023A801871382D40582C45000F282100 -001E011D007251D01E206E2855000F28 -2100001E023A80D072382D40102C4580 -0F282100001E00000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000042 diff --git a/configs/kvmd/edid/v0.hex b/configs/kvmd/edid/v0.hex deleted file mode 100644 index 6c53d8d6..00000000 --- a/configs/kvmd/edid/v0.hex +++ /dev/null @@ -1,16 +0,0 @@ -00FFFFFFFFFFFF0031D8707701010101 -231A010380351E780E0565A756529C27 -0F50543FED00B300A9C0950090408180 -814081C0714F011D007251D01E206E28 -55000F282100001E000000FF00434146 -45424142452020202020000000FD0032 -4B0F5211000A202020202020000000FC -0050694B564D0A20202020202020018D -020317314A841F13223E213D203C0167 -030C001000802D011D007251D01E206E -2855000F282100001E00000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000015 diff --git a/configs/kvmd/edid/v1.hex b/configs/kvmd/edid/v1.hex deleted file mode 100644 index 6c53d8d6..00000000 --- a/configs/kvmd/edid/v1.hex +++ /dev/null @@ -1,16 +0,0 @@ -00FFFFFFFFFFFF0031D8707701010101 -231A010380351E780E0565A756529C27 -0F50543FED00B300A9C0950090408180 -814081C0714F011D007251D01E206E28 -55000F282100001E000000FF00434146 -45424142452020202020000000FD0032 -4B0F5211000A202020202020000000FC -0050694B564D0A20202020202020018D -020317314A841F13223E213D203C0167 -030C001000802D011D007251D01E206E -2855000F282100001E00000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000015 diff --git a/configs/kvmd/edid/v2.hex b/configs/kvmd/edid/v2.hex deleted file mode 100644 index 6c53d8d6..00000000 --- a/configs/kvmd/edid/v2.hex +++ /dev/null @@ -1,16 +0,0 @@ -00FFFFFFFFFFFF0031D8707701010101 -231A010380351E780E0565A756529C27 -0F50543FED00B300A9C0950090408180 -814081C0714F011D007251D01E206E28 -55000F282100001E000000FF00434146 -45424142452020202020000000FD0032 -4B0F5211000A202020202020000000FC -0050694B564D0A20202020202020018D -020317314A841F13223E213D203C0167 -030C001000802D011D007251D01E206E -2855000F282100001E00000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000015 diff --git a/configs/kvmd/edid/v3.hex b/configs/kvmd/edid/v3.hex deleted file mode 100644 index aeb8dc29..00000000 --- a/configs/kvmd/edid/v3.hex +++ /dev/null @@ -1,16 +0,0 @@ -00FFFFFFFFFFFF0031D8717701010101 -231A010380351E780E0565A756529C27 -0F50543FED00B300A9C0950090408180 -814081C0714F011D007251D01E206E28 -55000F282100001E000000FF00434146 -45424142452020202020000000FD0032 -4B0F5211000A202020202020000000FC -0050694B564D2056330A202020200143 -020317314A841F13223E213D203C0167 -030C001000802D011D007251D01E206E -2855000F282100001E00000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000015 diff --git a/configs/kvmd/edid/v4mini.hex b/configs/kvmd/edid/v4mini.hex deleted file mode 100644 index a38e70d2..00000000 --- a/configs/kvmd/edid/v4mini.hex +++ /dev/null @@ -1,16 +0,0 @@ -00FFFFFFFFFFFF0031D8727701010101 -231A010380351E780E0565A756529C27 -0F50543FED00B300A9C0950090408180 -814081C0714F023A801871382D40582C -45000F282100001E000000FF00434146 -45424142452020202020000000FD0032 -4B0F5211000A202020202020000000FC -0050694B564D205634204D696E690145 -020320714B90041F13223E213D203C01 -67030C001000802D23097F0783010000 -023A801871382D40582C45000F282100 -001E011D007251D01E206E2855000F28 -2100001E023A80D072382D40102C4580 -0F282100001E283C80A070B023403020 -360006442100001A0000000000000000 -00000000000000000000000000000030 diff --git a/configs/kvmd/edid/v4plus.hex b/configs/kvmd/edid/v4plus.hex deleted file mode 100644 index 9be030c2..00000000 --- a/configs/kvmd/edid/v4plus.hex +++ /dev/null @@ -1,16 +0,0 @@ -00FFFFFFFFFFFF0031D8737701010101 -231A010380351E780E0565A756529C27 -0F50543FED00B300A9C0950090408180 -814081C0714F023A801871382D40582C -45000F282100001E000000FF00434146 -45424142452020202020000000FD0032 -4B0F5211000A202020202020000000FC -0050694B564D20563420506C7573012D -020320714B90041F13223E213D203C01 -67030C001000802D23097F0783010000 -023A801871382D40582C45000F282100 -001E011D007251D01E206E2855000F28 -2100001E023A80D072382D40102C4580 -0F282100001E283C80A070B023403020 -360006442100001A0000000000000000 -00000000000000000000000000000030 diff --git a/configs/kvmd/fan/v3-hdmi.ini b/configs/kvmd/fan/v3-hdmi.ini deleted file mode 100644 index 6b8b6977..00000000 --- a/configs/kvmd/fan/v3-hdmi.ini +++ /dev/null @@ -1,4 +0,0 @@ -[server] -unix = /run/kvmd/fan.sock -unix_rm = 1 -unix_mode = 666 diff --git a/configs/kvmd/fan/v4mini-hdmi.ini b/configs/kvmd/fan/v4mini-hdmi.ini deleted file mode 100644 index b7d0b378..00000000 --- a/configs/kvmd/fan/v4mini-hdmi.ini +++ /dev/null @@ -1,12 +0,0 @@ -[main] -pwm_pin = 13 -hall_pin = 16 - -[speed] -idle = 27 -low = 27 - -[server] -unix = /run/kvmd/fan.sock -unix_rm = 1 -unix_mode = 666 diff --git a/configs/kvmd/fan/v4plus-hdmi.ini b/configs/kvmd/fan/v4plus-hdmi.ini deleted file mode 100644 index b7d0b378..00000000 --- a/configs/kvmd/fan/v4plus-hdmi.ini +++ /dev/null @@ -1,12 +0,0 @@ -[main] -pwm_pin = 13 -hall_pin = 16 - -[speed] -idle = 27 -low = 27 - -[server] -unix = /run/kvmd/fan.sock -unix_rm = 1 -unix_mode = 666 diff --git a/configs/kvmd/main/v2-hdmiusb-rpi4.yaml b/configs/kvmd/main.yaml similarity index 100% rename from configs/kvmd/main/v2-hdmiusb-rpi4.yaml rename to configs/kvmd/main.yaml diff --git a/configs/kvmd/main/v0-hdmi-rpi2.yaml b/configs/kvmd/main/v0-hdmi-rpi2.yaml deleted file mode 100644 index af763cd8..00000000 --- a/configs/kvmd/main/v0-hdmi-rpi2.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: serial - - atx: - type: gpio - - msd: - type: disabled - - streamer: - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--dv-timings" - - "--format=uyvy" - - "--encoder=m2m-image" - - "--workers=3" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" diff --git a/configs/kvmd/main/v0-hdmi-rpi3.yaml b/configs/kvmd/main/v0-hdmi-rpi3.yaml deleted file mode 100644 index a44169e9..00000000 --- a/configs/kvmd/main/v0-hdmi-rpi3.yaml +++ /dev/null @@ -1,47 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: serial - - atx: - type: gpio - - msd: - type: disabled - - streamer: - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--dv-timings" - - "--format=uyvy" - - "--encoder=m2m-image" - - "--workers=3" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - -vnc: - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" diff --git a/configs/kvmd/main/v0-hdmi-zero2w.yaml b/configs/kvmd/main/v0-hdmi-zero2w.yaml deleted file mode 100644 index 96e89761..00000000 --- a/configs/kvmd/main/v0-hdmi-zero2w.yaml +++ /dev/null @@ -1,55 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: serial - - atx: - type: gpio - - msd: - type: disabled - - streamer: - h264_bitrate: - default: 5000 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--dv-timings" - - "--format=uyvy" - - "--encoder=m2m-image" - - "--workers=3" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - "--h264-sink=kvmd::ustreamer::h264" - - "--h264-sink-mode=0660" - - "--h264-bitrate={h264_bitrate}" - - "--h264-gop={h264_gop}" - - -vnc: - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" - h264: - sink: "kvmd::ustreamer::h264" diff --git a/configs/kvmd/main/v0-hdmiusb-rpi2.yaml b/configs/kvmd/main/v0-hdmiusb-rpi2.yaml deleted file mode 100644 index b265935d..00000000 --- a/configs/kvmd/main/v0-hdmiusb-rpi2.yaml +++ /dev/null @@ -1,51 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: serial - - atx: - type: gpio - - msd: - type: disabled - - streamer: - quality: 0 - resolution: - default: 1920x1080 - available: - - 1920x1080 - - 1600x1200 - - 1360x768 - - 1280x1024 - - 1280x960 - - 1280x720 - - 1024x768 - - 800x600 - - 720x576 - - 720x480 - - 640x480 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--format=mjpeg" - - "--resolution={resolution}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" diff --git a/configs/kvmd/main/v0-hdmiusb-rpi3.yaml b/configs/kvmd/main/v0-hdmiusb-rpi3.yaml deleted file mode 100644 index 54a55bb5..00000000 --- a/configs/kvmd/main/v0-hdmiusb-rpi3.yaml +++ /dev/null @@ -1,59 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: serial - - atx: - type: gpio - - msd: - type: disabled - - streamer: - quality: 0 - resolution: - default: 1920x1080 - available: - - 1920x1080 - - 1600x1200 - - 1360x768 - - 1280x1024 - - 1280x960 - - 1280x720 - - 1024x768 - - 800x600 - - 720x576 - - 720x480 - - 640x480 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--format=mjpeg" - - "--resolution={resolution}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - -vnc: - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" diff --git a/configs/kvmd/main/v0-hdmiusb-zero2w.yaml b/configs/kvmd/main/v0-hdmiusb-zero2w.yaml deleted file mode 100644 index 54a55bb5..00000000 --- a/configs/kvmd/main/v0-hdmiusb-zero2w.yaml +++ /dev/null @@ -1,59 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: serial - - atx: - type: gpio - - msd: - type: disabled - - streamer: - quality: 0 - resolution: - default: 1920x1080 - available: - - 1920x1080 - - 1600x1200 - - 1360x768 - - 1280x1024 - - 1280x960 - - 1280x720 - - 1024x768 - - 800x600 - - 720x576 - - 720x480 - - 640x480 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--format=mjpeg" - - "--resolution={resolution}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - -vnc: - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" diff --git a/configs/kvmd/main/v1-hdmi-rpi2.yaml b/configs/kvmd/main/v1-hdmi-rpi2.yaml deleted file mode 100644 index af85f99b..00000000 --- a/configs/kvmd/main/v1-hdmi-rpi2.yaml +++ /dev/null @@ -1,48 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: spi - chip: 0 - bus: 0 - sw_cs_pin: 7 - sw_cs_per_byte: true - reset_pin: 25 - reset_inverted: true - reset_self: true - power_detect_pin: 16 - power_detect_pull_down: true - - atx: - type: gpio - - msd: - type: disabled - - streamer: - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--dv-timings" - - "--format=uyvy" - - "--encoder=m2m-image" - - "--workers=3" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" diff --git a/configs/kvmd/main/v1-hdmi-rpi3.yaml b/configs/kvmd/main/v1-hdmi-rpi3.yaml deleted file mode 100644 index e8e442f3..00000000 --- a/configs/kvmd/main/v1-hdmi-rpi3.yaml +++ /dev/null @@ -1,64 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: spi - chip: 0 - bus: 0 - sw_cs_pin: 7 - sw_cs_per_byte: true - reset_pin: 25 - reset_inverted: true - reset_self: true - power_detect_pin: 16 - power_detect_pull_down: true - - atx: - type: gpio - - msd: - type: disabled - - streamer: - h264_bitrate: - default: 5000 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--dv-timings" - - "--format=uyvy" - - "--encoder=m2m-image" - - "--workers=3" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - "--h264-sink=kvmd::ustreamer::h264" - - "--h264-sink-mode=0660" - - "--h264-bitrate={h264_bitrate}" - - "--h264-gop={h264_gop}" - - -vnc: - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" - h264: - sink: "kvmd::ustreamer::h264" diff --git a/configs/kvmd/main/v1-hdmi-zero2w.yaml b/configs/kvmd/main/v1-hdmi-zero2w.yaml deleted file mode 100644 index e8e442f3..00000000 --- a/configs/kvmd/main/v1-hdmi-zero2w.yaml +++ /dev/null @@ -1,64 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: spi - chip: 0 - bus: 0 - sw_cs_pin: 7 - sw_cs_per_byte: true - reset_pin: 25 - reset_inverted: true - reset_self: true - power_detect_pin: 16 - power_detect_pull_down: true - - atx: - type: gpio - - msd: - type: disabled - - streamer: - h264_bitrate: - default: 5000 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--dv-timings" - - "--format=uyvy" - - "--encoder=m2m-image" - - "--workers=3" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - "--h264-sink=kvmd::ustreamer::h264" - - "--h264-sink-mode=0660" - - "--h264-bitrate={h264_bitrate}" - - "--h264-gop={h264_gop}" - - -vnc: - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" - h264: - sink: "kvmd::ustreamer::h264" diff --git a/configs/kvmd/main/v1-hdmiusb-rpi2.yaml b/configs/kvmd/main/v1-hdmiusb-rpi2.yaml deleted file mode 100644 index 09c6b4a8..00000000 --- a/configs/kvmd/main/v1-hdmiusb-rpi2.yaml +++ /dev/null @@ -1,60 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: spi - chip: 0 - bus: 0 - sw_cs_pin: 7 - sw_cs_per_byte: true - reset_pin: 25 - reset_inverted: true - reset_self: true - power_detect_pin: 16 - power_detect_pull_down: true - - atx: - type: gpio - - msd: - type: disabled - - streamer: - quality: 0 - resolution: - default: 1920x1080 - available: - - 1920x1080 - - 1600x1200 - - 1360x768 - - 1280x1024 - - 1280x960 - - 1280x720 - - 1024x768 - - 800x600 - - 720x576 - - 720x480 - - 640x480 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--format=mjpeg" - - "--resolution={resolution}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" diff --git a/configs/kvmd/main/v1-hdmiusb-rpi3.yaml b/configs/kvmd/main/v1-hdmiusb-rpi3.yaml deleted file mode 100644 index d3d9d7fd..00000000 --- a/configs/kvmd/main/v1-hdmiusb-rpi3.yaml +++ /dev/null @@ -1,68 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: spi - chip: 0 - bus: 0 - sw_cs_pin: 7 - sw_cs_per_byte: true - reset_pin: 25 - reset_inverted: true - reset_self: true - power_detect_pin: 16 - power_detect_pull_down: true - - atx: - type: gpio - - msd: - type: disabled - - streamer: - quality: 0 - resolution: - default: 1920x1080 - available: - - 1920x1080 - - 1600x1200 - - 1360x768 - - 1280x1024 - - 1280x960 - - 1280x720 - - 1024x768 - - 800x600 - - 720x576 - - 720x480 - - 640x480 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--format=mjpeg" - - "--resolution={resolution}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - -vnc: - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" diff --git a/configs/kvmd/main/v1-hdmiusb-zero2w.yaml b/configs/kvmd/main/v1-hdmiusb-zero2w.yaml deleted file mode 100644 index d3d9d7fd..00000000 --- a/configs/kvmd/main/v1-hdmiusb-zero2w.yaml +++ /dev/null @@ -1,68 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: spi - chip: 0 - bus: 0 - sw_cs_pin: 7 - sw_cs_per_byte: true - reset_pin: 25 - reset_inverted: true - reset_self: true - power_detect_pin: 16 - power_detect_pull_down: true - - atx: - type: gpio - - msd: - type: disabled - - streamer: - quality: 0 - resolution: - default: 1920x1080 - available: - - 1920x1080 - - 1600x1200 - - 1360x768 - - 1280x1024 - - 1280x960 - - 1280x720 - - 1024x768 - - 800x600 - - 720x576 - - 720x480 - - 640x480 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--format=mjpeg" - - "--resolution={resolution}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - -vnc: - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" diff --git a/configs/kvmd/main/v2-hdmi-rpi3.yaml b/configs/kvmd/main/v2-hdmi-rpi3.yaml deleted file mode 100644 index 3bfc000f..00000000 --- a/configs/kvmd/main/v2-hdmi-rpi3.yaml +++ /dev/null @@ -1,55 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: otg - - atx: - type: gpio - - msd: - type: otg - - streamer: - h264_bitrate: - default: 5000 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--dv-timings" - - "--format=uyvy" - - "--encoder=m2m-image" - - "--workers=3" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - "--h264-sink=kvmd::ustreamer::h264" - - "--h264-sink-mode=0660" - - "--h264-bitrate={h264_bitrate}" - - "--h264-gop={h264_gop}" - - -vnc: - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" - h264: - sink: "kvmd::ustreamer::h264" diff --git a/configs/kvmd/main/v2-hdmi-rpi4.yaml b/configs/kvmd/main/v2-hdmi-rpi4.yaml deleted file mode 100644 index ea3c8c10..00000000 --- a/configs/kvmd/main/v2-hdmi-rpi4.yaml +++ /dev/null @@ -1,56 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: otg - - atx: - type: gpio - - msd: - type: otg - - streamer: - h264_bitrate: - default: 5000 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--dv-timings" - - "--format=uyvy" - - "--buffers=6" - - "--encoder=m2m-image" - - "--workers=3" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - "--h264-sink=kvmd::ustreamer::h264" - - "--h264-sink-mode=0660" - - "--h264-bitrate={h264_bitrate}" - - "--h264-gop={h264_gop}" - - -vnc: - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" - h264: - sink: "kvmd::ustreamer::h264" diff --git a/configs/kvmd/main/v2-hdmi-zero2w.yaml b/configs/kvmd/main/v2-hdmi-zero2w.yaml deleted file mode 100644 index 3bfc000f..00000000 --- a/configs/kvmd/main/v2-hdmi-zero2w.yaml +++ /dev/null @@ -1,55 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: otg - - atx: - type: gpio - - msd: - type: otg - - streamer: - h264_bitrate: - default: 5000 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--dv-timings" - - "--format=uyvy" - - "--encoder=m2m-image" - - "--workers=3" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - "--h264-sink=kvmd::ustreamer::h264" - - "--h264-sink-mode=0660" - - "--h264-bitrate={h264_bitrate}" - - "--h264-gop={h264_gop}" - - -vnc: - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" - h264: - sink: "kvmd::ustreamer::h264" diff --git a/configs/kvmd/main/v2-hdmiusb-generic.yaml b/configs/kvmd/main/v2-hdmiusb-generic.yaml deleted file mode 100644 index 400d6038..00000000 --- a/configs/kvmd/main/v2-hdmiusb-generic.yaml +++ /dev/null @@ -1,59 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - hid: - type: otg - - atx: - type: disabled - - msd: - type: otg - - streamer: - quality: 0 - resolution: - default: 1920x1080 - available: - - 1920x1080 - - 1600x1200 - - 1360x768 - - 1280x1024 - - 1280x960 - - 1280x720 - - 1024x768 - - 800x600 - - 720x576 - - 720x480 - - 640x480 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--format=mjpeg" - - "--resolution={resolution}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - -vnc: - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" diff --git a/configs/kvmd/main/v3-hdmi-rpi4.yaml b/configs/kvmd/main/v3-hdmi-rpi4.yaml deleted file mode 100644 index 50b140b0..00000000 --- a/configs/kvmd/main/v3-hdmi-rpi4.yaml +++ /dev/null @@ -1,68 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - info: - fan: - unix: /run/kvmd/fan.sock - - hid: - type: otg - - atx: - type: gpio - - msd: - type: otg - - streamer: - h264_bitrate: - default: 5000 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--dv-timings" - - "--format=uyvy" - - "--buffers=6" - - "--encoder=m2m-image" - - "--workers=3" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - "--h264-sink=kvmd::ustreamer::h264" - - "--h264-sink-mode=0660" - - "--h264-bitrate={h264_bitrate}" - - "--h264-gop={h264_gop}" - - gpio: - scheme: - __v3_usb_breaker__: - pin: 5 - mode: output - initial: true - pulse: false - - -vnc: - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" - h264: - sink: "kvmd::ustreamer::h264" diff --git a/configs/kvmd/main/v4mini-hdmi-rpi4.yaml b/configs/kvmd/main/v4mini-hdmi-rpi4.yaml deleted file mode 100644 index 410544d7..00000000 --- a/configs/kvmd/main/v4mini-hdmi-rpi4.yaml +++ /dev/null @@ -1,97 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - info: - hw: - ignore_past: true - fan: - unix: /run/kvmd/fan.sock - - hid: - type: otg - mouse_alt: - device: /dev/kvmd-hid-mouse-alt - - atx: - type: gpio - power_led_pin: 4 - hdd_led_pin: 5 - power_switch_pin: 23 - reset_switch_pin: 27 - - msd: - type: otg - - streamer: - h264_bitrate: - default: 5000 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--dv-timings" - - "--format=uyvy" - - "--buffers=6" - - "--encoder=m2m-image" - - "--workers=3" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - "--h264-sink=kvmd::ustreamer::h264" - - "--h264-sink-mode=0660" - - "--h264-bitrate={h264_bitrate}" - - "--h264-gop={h264_gop}" - - gpio: - drivers: - __v4_locator__: - type: locator - - scheme: - __v3_usb_breaker__: - pin: 22 - mode: output - initial: true - pulse: false - - __v4_locator__: - driver: __v4_locator__ - pin: 12 - mode: output - pulse: false - - __v4_const1__: - pin: 6 - mode: output - initial: false - switch: false - pulse: false - - -vnc: - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" - h264: - sink: "kvmd::ustreamer::h264" - - -otg: - remote_wakeup: true diff --git a/configs/kvmd/main/v4plus-hdmi-rpi4.yaml b/configs/kvmd/main/v4plus-hdmi-rpi4.yaml deleted file mode 100644 index c1e6faff..00000000 --- a/configs/kvmd/main/v4plus-hdmi-rpi4.yaml +++ /dev/null @@ -1,98 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include [override.d, override.yaml] - -logging: !include logging.yaml - -kvmd: - auth: !include auth.yaml - - info: - hw: - ignore_past: true - fan: - unix: /run/kvmd/fan.sock - - hid: - type: otg - mouse_alt: - device: /dev/kvmd-hid-mouse-alt - - atx: - type: gpio - power_led_pin: 4 - hdd_led_pin: 5 - power_switch_pin: 23 - reset_switch_pin: 27 - - msd: - type: otg - - streamer: - h264_bitrate: - default: 5000 - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--dv-timings" - - "--format=uyvy" - - "--format-swap-rgb" - - "--buffers=8" - - "--encoder=m2m-image" - - "--workers=3" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - - "--jpeg-sink=kvmd::ustreamer::jpeg" - - "--jpeg-sink-mode=0660" - - "--h264-sink=kvmd::ustreamer::h264" - - "--h264-sink-mode=0660" - - "--h264-bitrate={h264_bitrate}" - - "--h264-gop={h264_gop}" - - gpio: - drivers: - __v4_locator__: - type: locator - - scheme: - __v3_usb_breaker__: - pin: 22 - mode: output - initial: true - pulse: false - - __v4_locator__: - driver: __v4_locator__ - pin: 12 - mode: output - pulse: false - - __v4_const1__: - pin: 6 - mode: output - initial: false - switch: false - pulse: false - - -vnc: - memsink: - jpeg: - sink: "kvmd::ustreamer::jpeg" - h264: - sink: "kvmd::ustreamer::h264" - - -otg: - remote_wakeup: true diff --git a/configs/kvmd/override.yaml b/configs/kvmd/override.yaml index bb05bce1..c23192c3 100644 --- a/configs/kvmd/override.yaml +++ b/configs/kvmd/override.yaml @@ -1,39 +1,78 @@ -############################################################################### -# # -# Override KVMD settings. # -# # -# * https://docs.pikvm.org/first_steps/#structure-of-configuration-files # -# # -# This file uses YAML syntax. All overridden parameters will be applied # -# AFTER other configs and "!include" directives, and BEFORE validation. # -# Values should be combined under common sections. # -# # -############################################################################### -# -######### -# Wrong # -######### -#kvmd: -# gpio: -# drivers: ... -#kvmd: -# gpio: -# scheme: ... -# -########### -# Correct # -########### -#kvmd: -# gpio: -# drivers: ... -# scheme: ... -# -########### -# Example # -########### -#vnc: -# # See https://docs.pikvm.org/vnc -# keymap: /usr/share/kvmd/keymaps/ru # Set russian keymap -# auth: -# vncauth: -# enabled: true # Enable auth via /etc/kvmd/vncpasswd +kvmd: + auth: + enabled: true + + server: + unix_mode: 0666 + + atx: + type: disabled + + hid: + type: ch9329 + device: /dev/ttyUSB0 + + msd: + type: disabled + + streamer: + resolution: + default: 1280x720 + forever: true + h264_bitrate: + default: 2000 + cmd: + - "/usr/bin/ustreamer" + - "--device=/dev/video0" + - "--persistent" + - "--format=mjpeg" + - "--encoder=LIBX264-VIDEO" + - "--resolution={resolution}" + - "--desired-fps={desired_fps}" + - "--drop-same-frames=30" + - "--last-as-blank=0" + - "--unix={unix}" + - "--unix-rm" + - "--unix-mode=0666" + - "--exit-on-parent-death" + - "--process-name-prefix={process_name_prefix}" + - "--notify-parent" + - "--no-log-colors" + - "--h264-sink=kvmd::ustreamer::h264" + - "--h264-sink-mode=0660" + - "--jpeg-sink=kvmd::ustreamer::jpeg" + - "--jpeg-sink-mode=0660" + - "--h264-bitrate={h264_bitrate}" + - "--h264-gop={h264_gop}" + - "--slowdown" + +vnc: + keymap: /usr/share/kvmd/keymaps/ru + + auth: + vncauth: + enabled: true + + memsink: + jpeg: + sink: "kvmd::ustreamer::jpeg" + h264: + sink: "kvmd::ustreamer::h264" + +otgnet: + commands: + post_start_cmd: + - "/bin/true" + pre_stop_cmd: + - "/bin/true" + +nginx: + http: + port: 8080 + https: + port: 4430 + + +languages: + console: zh + web: zh