improved users/groups

This commit is contained in:
Devaev Maxim
2019-05-10 14:36:28 +03:00
parent 03c3caa35e
commit 18fa69b779
15 changed files with 56 additions and 37 deletions

View File

@@ -5,7 +5,7 @@ logging: !include logging.yaml
kvmd:
server:
unix: /run/kvmd.sock
unix: /run/kvmd/kvmd.sock
unix_rm: true
unix_mode: 0660
@@ -27,7 +27,7 @@ kvmd:
device: /dev/kvmd-msd
streamer:
unix: /run/ustreamer.sock
unix: /run/kvmd/ustreamer.sock
cmd:
- "/usr/bin/ustreamer"
- "--device=/dev/kvmd-video"
@@ -45,4 +45,4 @@ kvmd:
ipmi:
kvmd:
unix: /run/kvmd.sock
unix: /run/kvmd/kvmd.sock

View File

@@ -5,7 +5,7 @@ logging: !include logging.yaml
kvmd:
server:
unix: /run/kvmd.sock
unix: /run/kvmd/kvmd.sock
unix_rm: true
unix_mode: 0660
@@ -30,7 +30,7 @@ kvmd:
cap_pin: 17
conv_pin: 18
init_restart_after: 1
unix: /run/ustreamer.sock
unix: /run/kvmd/ustreamer.sock
cmd:
- "/usr/bin/ustreamer"
- "--device=/dev/kvmd-video"
@@ -49,4 +49,4 @@ kvmd:
ipmi:
kvmd:
unix: /run/kvmd.sock
unix: /run/kvmd/kvmd.sock

View File

@@ -1,4 +1,3 @@
user kvmd-nginx;
worker_processes 4;
# error_log /tmp/kvmd-nginx.error.log;
@@ -35,11 +34,11 @@ http {
uwsgi_temp_path /tmp/kvmd-nginx.uwsgi_temp;
upstream kvmd {
server unix:/run/kvmd.sock fail_timeout=0s max_fails=0;
server unix:/run/kvmd/kvmd.sock fail_timeout=0s max_fails=0;
}
upstream ustreamer {
server unix:/run/ustreamer.sock fail_timeout=0s max_fails=0;
server unix:/run/kvmd/ustreamer.sock fail_timeout=0s max_fails=0;
}
include /usr/share/kvmd/extras/*/nginx.ctx-http.conf;

View File

@@ -1,10 +1,10 @@
[Unit]
Description=IPMI to KVMD proxy
Description=Pi-KVM - IPMI to KVMD proxy
After=kvmd.service
[Service]
User=kvmd
Group=kvmd
User=kvmd-ipmi
Group=kvmd-ipmi
Type=simple
Restart=always
RestartSec=3

View File

@@ -1,14 +1,14 @@
[Unit]
Description=Nginx instance for KVMD
Description=Pi-KVM - HTTP entrypoint
After=network.target network-online.target nss-lookup.target kvmd.service
[Service]
Type=forking
PIDFile=/run/kvmd-nginx.pid
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; error_log stderr;'
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
KillSignal=SIGQUIT
KillMode=mixed

View File

@@ -1,5 +1,5 @@
[Unit]
Description=Loads EDID data to TC358743
Description=Pi-KVM - EDID loader for TC358743
After=systemd-modules-load.service
Before=kvmd.service

View File

@@ -1,5 +1,5 @@
[Unit]
Description=The main Pi-KVM daemon
Description=Pi-KVM - The main daemon
After=network.target network-online.target nss-lookup.target
[Service]

1
configs/os/tmpfiles.conf Normal file
View File

@@ -0,0 +1 @@
D /run/kvmd 0775 kvmd kvmd -