From a1c14ac2d982cf63b944d22eb0035635e14655a0 Mon Sep 17 00:00:00 2001 From: mofeng-git Date: Sat, 5 Oct 2024 03:16:59 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sudoer=20=E9=94=99?= =?UTF-8?q?=E8=AF=AF=20=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/build_img.sh | 6 +++--- configs/kvmd/override.yaml | 25 +++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/build/build_img.sh b/build/build_img.sh index 7aaa9f39..3e1a48aa 100644 --- a/build/build_img.sh +++ b/build/build_img.sh @@ -95,8 +95,8 @@ sudo chroot --userspec "root:root" $ROOTFS bash -c " \ && cp /One-KVM/configs/os/services/* /etc/systemd/system/ \ && cp /One-KVM/configs/os/tmpfiles.conf /usr/lib/tmpfiles.d/ \ && chmod +x /etc/update-motd.d/* \ - && echo 'kvmd ALL=\(ALL\) NOPASSWD: /etc/kvmd/custom_atx/gpio.sh' >> /etc/sudoers \ - && echo 'kvmd ALL=\(ALL\) NOPASSWD: /etc/kvmd/custom_atx/usbrelay_hid.sh' >> /etc/sudoers \ + && echo 'kvmd ALL=(ALL) NOPASSWD: /etc/kvmd/custom_atx/gpio.sh' >> /etc/sudoers \ + && echo 'kvmd ALL=(ALL) NOPASSWD: /etc/kvmd/custom_atx/usbrelay_hid.sh' >> /etc/sudoers \ && systemd-sysusers /One-KVM/configs/os/sysusers.conf \ && ln -sf /usr/share/tesseract-ocr/*/tessdata /usr/share/tessdata \ && sed -i 's/ch9329/otg/g' /etc/kvmd/override.yaml \ @@ -124,4 +124,4 @@ sudo umount $ROOTFS sudo rm $SRCPATH/tmp/7.rootfs.PARTITION.sparse sudo img2simg $SRCPATH/tmp/rootfs.img $SRCPATH/tmp/7.rootfs.PARTITION.sparse sudo $SRCPATH/image/onecloud/AmlImg_v0.3.1_linux_amd64 pack $SRCPATH/output/One-KVM_by-SilentWind_Onecloud_241004.burn.img $SRCPATH/tmp/ -sudo rm $SRCPATH/tmp/* \ No newline at end of file +sudo rm $SRCPATH/tmp/* diff --git a/configs/kvmd/override.yaml b/configs/kvmd/override.yaml index 519753b3..9ec6ea73 100644 --- a/configs/kvmd/override.yaml +++ b/configs/kvmd/override.yaml @@ -4,6 +4,7 @@ kvmd: server: unix_mode: 0666 + access_log_format: '[%P / %{X-Real-IP}i] ''%r'' => 响应:%s;大小:%b;来源:''%{Referer}i'';用户代理:''%{User-Agent}i''' atx: type: disabled @@ -12,15 +13,34 @@ kvmd: type: ch9329 device: /dev/ttyUSB0 + jiggler: + active: false + enabled: true + + mouse_alt: + device: /dev/kvmd-hid-mouse-alt + msd: type: disabled + ocr: + langs: + - eng + - chi_sim + streamer: resolution: default: 1280x720 + forever: true + + desired_fps: + default: 30 + max: 60 + h264_bitrate: default: 2000 + cmd: - "/usr/bin/ustreamer" - "--device=/dev/video0" @@ -114,7 +134,8 @@ kvmd: vnc: - keymap: /usr/share/kvmd/keymaps/ru + keymap: /usr/share/kvmd/keymaps/en-us + mouse_output: usb auth: vncauth: @@ -142,4 +163,4 @@ nginx: languages: console: zh - web: zh + web: zh \ No newline at end of file