GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-13 01:30:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

using override.d

Browse Source
This commit is contained in:
Maxim Devaev 2021-10-27 17:37:21 +03:00
parent d084110481
commit 940539f6f5
16 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -85,6 +85,7 @@ tox: testenv
&& cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \
&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \
&& cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \
&& mkdir -p /etc/kvmd/override.d \
&& cp /src/testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \ && cp /src/testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \
&& cd /src \ && cd /src \
&& $(if $(CMD),$(CMD),tox -q -c testenv/tox.ini $(if $(E),-e $(E),-p auto)) \ && $(if $(CMD),$(CMD),tox -q -c testenv/tox.ini $(if $(E),-e $(E),-p auto)) \
@ -126,6 +127,7 @@ run: testenv $(TESTENV_GPIO)
&& cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \
&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \
&& cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \
&& mkdir -p /etc/kvmd/override.d \
&& cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \ && cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \
&& cp /usr/share/kvmd/configs.default/kvmd/web.css /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/web.css /etc/kvmd \
&& nginx -c /etc/kvmd/nginx/nginx.conf -g 'user http; error_log stderr;' \ && nginx -c /etc/kvmd/nginx/nginx.conf -g 'user http; error_log stderr;' \
@ -149,6 +151,7 @@ run-cfg: testenv
&& cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \
&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \
&& cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \
&& mkdir -p /etc/kvmd/override.d \
&& cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \ && cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \
&& $(if $(CMD),$(CMD),python -m kvmd.apps.kvmd -m) \ && $(if $(CMD),$(CMD),python -m kvmd.apps.kvmd -m) \
" "
@ -169,6 +172,7 @@ run-ipmi: testenv
&& cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \
&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \
&& cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \
&& mkdir -p /etc/kvmd/override.d \
&& cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \ && cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \
&& $(if $(CMD),$(CMD),python -m kvmd.apps.ipmi --run) \ && $(if $(CMD),$(CMD),python -m kvmd.apps.ipmi --run) \
" "
@ -189,6 +193,7 @@ run-vnc: testenv
&& cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \
&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \
&& cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \
&& mkdir -p /etc/kvmd/override.d \
&& cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \ && cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \
&& $(if $(CMD),$(CMD),python -m kvmd.apps.vnc --run) \ && $(if $(CMD),$(CMD),python -m kvmd.apps.vnc --run) \
" "

1
PKGBUILD
View File

@ -152,6 +152,7 @@ package_kvmd() {
install -Dm644 -t "$pkgdir/etc/kvmd" "$_cfg_default/kvmd"/*.yaml install -Dm644 -t "$pkgdir/etc/kvmd" "$_cfg_default/kvmd"/*.yaml
install -Dm600 -t "$pkgdir/etc/kvmd" "$_cfg_default/kvmd"/*passwd install -Dm600 -t "$pkgdir/etc/kvmd" "$_cfg_default/kvmd"/*passwd
install -Dm644 -t "$pkgdir/etc/kvmd" "$_cfg_default/kvmd"/web.css install -Dm644 -t "$pkgdir/etc/kvmd" "$_cfg_default/kvmd"/web.css
mkdir -p "$pkgdir/etc/kvmd/override.d"
mkdir -p "$pkgdir/var/lib/kvmd/msd" mkdir -p "$pkgdir/var/lib/kvmd/msd"

2
configs/kvmd/main/v0-hdmi-rpi.yaml
View File

@ -2,7 +2,7 @@
# Use override.yaml to modify required settings. # Use override.yaml to modify required settings.
# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
override: !include override.yaml override: !include [override.d, override.yaml]
logging: !include logging.yaml logging: !include logging.yaml

2
configs/kvmd/main/v0-hdmi-rpi2.yaml
View File

@ -2,7 +2,7 @@
# Use override.yaml to modify required settings. # Use override.yaml to modify required settings.
# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
override: !include override.yaml override: !include [override.d, override.yaml]
logging: !include logging.yaml logging: !include logging.yaml

2
configs/kvmd/main/v0-hdmi-rpi3.yaml
View File

@ -2,7 +2,7 @@
# Use override.yaml to modify required settings. # Use override.yaml to modify required settings.
# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
override: !include override.yaml override: !include [override.d, override.yaml]
logging: !include logging.yaml logging: !include logging.yaml

2
configs/kvmd/main/v0-hdmi-zerow.yaml
View File

@ -2,7 +2,7 @@
# Use override.yaml to modify required settings. # Use override.yaml to modify required settings.
# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
override: !include override.yaml override: !include [override.d, override.yaml]
logging: !include logging.yaml logging: !include logging.yaml

2
configs/kvmd/main/v0-hdmiusb-rpi.yaml
View File

@ -2,7 +2,7 @@
# Use override.yaml to modify required settings. # Use override.yaml to modify required settings.
# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
override: !include override.yaml override: !include [override.d, override.yaml]
logging: !include logging.yaml logging: !include logging.yaml

2
configs/kvmd/main/v0-hdmiusb-rpi2.yaml
View File

@ -2,7 +2,7 @@
# Use override.yaml to modify required settings. # Use override.yaml to modify required settings.
# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
override: !include override.yaml override: !include [override.d, override.yaml]
logging: !include logging.yaml logging: !include logging.yaml

2
configs/kvmd/main/v0-hdmiusb-rpi3.yaml
View File

@ -2,7 +2,7 @@
# Use override.yaml to modify required settings. # Use override.yaml to modify required settings.
# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
override: !include override.yaml override: !include [override.d, override.yaml]
logging: !include logging.yaml logging: !include logging.yaml

2
configs/kvmd/main/v0-hdmiusb-zerow.yaml
View File

@ -2,7 +2,7 @@
# Use override.yaml to modify required settings. # Use override.yaml to modify required settings.
# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
override: !include override.yaml override: !include [override.d, override.yaml]
logging: !include logging.yaml logging: !include logging.yaml

2
configs/kvmd/main/v2-hdmi-rpi3.yaml
View File

@ -2,7 +2,7 @@
# Use override.yaml to modify required settings. # Use override.yaml to modify required settings.
# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
override: !include override.yaml override: !include [override.d, override.yaml]
logging: !include logging.yaml logging: !include logging.yaml

2
configs/kvmd/main/v2-hdmi-rpi4.yaml
View File

@ -2,7 +2,7 @@
# Use override.yaml to modify required settings. # Use override.yaml to modify required settings.
# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
override: !include override.yaml override: !include [override.d, override.yaml]
logging: !include logging.yaml logging: !include logging.yaml

2
configs/kvmd/main/v2-hdmi-zerow.yaml
View File

@ -2,7 +2,7 @@
# Use override.yaml to modify required settings. # Use override.yaml to modify required settings.
# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
override: !include override.yaml override: !include [override.d, override.yaml]
logging: !include logging.yaml logging: !include logging.yaml

2
configs/kvmd/main/v2-hdmiusb-generic.yaml
View File

@ -2,7 +2,7 @@
# Use override.yaml to modify required settings. # Use override.yaml to modify required settings.
# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
override: !include override.yaml override: !include [override.d, override.yaml]
logging: !include logging.yaml logging: !include logging.yaml

2
configs/kvmd/main/v2-hdmiusb-rpi4.yaml
View File

@ -2,7 +2,7 @@
# Use override.yaml to modify required settings. # Use override.yaml to modify required settings.
# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
override: !include override.yaml override: !include [override.d, override.yaml]
logging: !include logging.yaml logging: !include logging.yaml

2
configs/kvmd/main/v3-hdmi-rpi4.yaml
View File

@ -2,7 +2,7 @@
# Use override.yaml to modify required settings. # Use override.yaml to modify required settings.
# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
override: !include override.yaml override: !include [override.d, override.yaml]
logging: !include logging.yaml logging: !include logging.yaml