From 647251647d2677e1329b5b926f7c6d0b3ba0b5c4 Mon Sep 17 00:00:00 2001 From: Maxim Devaev Date: Wed, 11 Aug 2021 17:00:30 +0300 Subject: pikvm/pikvm#245: using sbin for some binaries --- configs/os/services/kvmd-nginx.service | 4 ++-- kvmd/apps/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/os/services/kvmd-nginx.service b/configs/os/services/kvmd-nginx.service index 2cfa1517..3f623248 100644 --- a/configs/os/services/kvmd-nginx.service +++ b/configs/os/services/kvmd-nginx.service @@ -8,8 +8,8 @@ PIDFile=/run/kvmd/nginx.pid PrivateDevices=yes SyslogLevel=err -ExecStart=/usr/bin/nginx -p /etc/kvmd/nginx -c /etc/kvmd/nginx/nginx.conf -g 'pid /run/kvmd/nginx.pid; user kvmd-nginx; error_log stderr;' -ExecReload=/usr/bin/nginx -s reload -p /etc/kvmd/nginx -c /etc/kvmd/nginx/nginx.conf +ExecStart=/usr/sbin/nginx -p /etc/kvmd/nginx -c /etc/kvmd/nginx/nginx.conf -g 'pid /run/kvmd/nginx.pid; user kvmd-nginx; error_log stderr;' +ExecReload=/usr/sbin/nginx -s reload -p /etc/kvmd/nginx -c /etc/kvmd/nginx/nginx.conf KillSignal=SIGQUIT KillMode=mixed TimeoutStopSec=3 diff --git a/kvmd/apps/__init__.py b/kvmd/apps/__init__.py index 08fc13ad..9da4c403 100644 --- a/kvmd/apps/__init__.py +++ b/kvmd/apps/__init__.py @@ -533,7 +533,7 @@ def _get_config_scheme() -> Dict: "allow_tcp": Option([], type=valid_ports_list), "allow_udp": Option([67], type=valid_ports_list), "forward_iface": Option("", type=valid_stripped_string), - "iptables_cmd": Option(["/usr/bin/iptables", "--wait=5"], type=valid_command), + "iptables_cmd": Option(["/usr/sbin/iptables", "--wait=5"], type=valid_command), }, "commands": { @@ -544,7 +544,7 @@ def _get_config_scheme() -> Dict: "post_start_cmd": Option([ "/usr/bin/systemd-run", "--unit=kvmd-otgnet-dnsmasq", - "/usr/bin/dnsmasq", + "/usr/sbin/dnsmasq", "--conf-file=/dev/null", "--pid-file", "--user=dnsmasq", -- cgit v1.2.3