improved users/groups

8 files changed, 17 insertions, 17 deletions

diff --git a/configs/kvmd/main/v1-hdmi.yaml b/configs/kvmd/main/v1-hdmi.yaml
index 64dfbffb..f3403eca 100644
--- a/configs/kvmd/main/v1-hdmi.yaml
+++ b/configs/kvmd/main/v1-hdmi.yaml
@@ -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
diff --git a/configs/kvmd/main/v1-vga.yaml b/configs/kvmd/main/v1-vga.yaml
index 0ace92e0..80e82bb9 100644
--- a/configs/kvmd/main/v1-vga.yaml
+++ b/configs/kvmd/main/v1-vga.yaml
@@ -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
diff --git a/configs/nginx/nginx.conf b/configs/nginx/nginx.conf
index 7246f1e3..9984d686 100644
--- a/configs/nginx/nginx.conf
+++ b/configs/nginx/nginx.conf
@@ -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;
diff --git a/configs/os/systemd/kvmd-ipmi.service b/configs/os/systemd/kvmd-ipmi.service
index ee28f923..bdbbdfc8 100644
--- a/configs/os/systemd/kvmd-ipmi.service
+++ b/configs/os/systemd/kvmd-ipmi.service
@@ -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
diff --git a/configs/os/systemd/kvmd-nginx.service b/configs/os/systemd/kvmd-nginx.service
index 6b318598..6da9fc1d 100644
--- a/configs/os/systemd/kvmd-nginx.service
+++ b/configs/os/systemd/kvmd-nginx.service
@@ -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
diff --git a/configs/os/systemd/kvmd-tc358743.service b/configs/os/systemd/kvmd-tc358743.service
index 44d26d1a..cb11d391 100644
--- a/configs/os/systemd/kvmd-tc358743.service
+++ b/configs/os/systemd/kvmd-tc358743.service
@@ -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
 
diff --git a/configs/os/systemd/kvmd.service b/configs/os/systemd/kvmd.service
index eaab01aa..d161b95e 100644
--- a/configs/os/systemd/kvmd.service
+++ b/configs/os/systemd/kvmd.service
@@ -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]
diff --git a/configs/os/tmpfiles.conf b/configs/os/tmpfiles.conf
new file mode 100644
index 00000000..8e1734d2
--- /dev/null
+++ b/configs/os/tmpfiles.conf
@@ -0,0 +1 @@
+D /run/kvmd 0775 kvmd kvmd -