From f0ab202711386beaca0de03a08e4ef9492368a6d Mon Sep 17 00:00:00 2001 From: "Josh.5" Date: Sun, 16 Jan 2022 15:21:45 +1300 Subject: [PATCH] Tidy up all supervisor configs (makes them more consistent) --- overlay/entrypoint.sh | 5 +++- overlay/etc/supervisor/conf.d/dbus.conf | 6 ++++ overlay/etc/supervisor/conf.d/pulseaudio.conf | 15 ++++++---- overlay/etc/supervisor/conf.d/sshd.conf | 17 ++++++----- overlay/etc/supervisor/conf.d/steam.conf | 12 +++++--- overlay/etc/supervisor/conf.d/udev.conf | 10 +++++-- overlay/etc/supervisor/conf.d/vnc-audio.conf | 24 ++++++++++------ overlay/etc/supervisor/conf.d/vnc.conf | 28 +++++++++++++------ overlay/etc/supervisor/conf.d/xfce4.conf | 12 +++++--- overlay/etc/supervisor/conf.d/xorg.conf | 15 ++++++---- 10 files changed, 96 insertions(+), 48 deletions(-) diff --git a/overlay/entrypoint.sh b/overlay/entrypoint.sh index 1575130..857e524 100644 --- a/overlay/entrypoint.sh +++ b/overlay/entrypoint.sh @@ -5,7 +5,7 @@ # File Created: Saturday, 8th January 2022 7:08:46 pm # Author: Josh.5 (jsunnex@gmail.com) # ----- -# Last Modified: Sunday, 16th January 2022 6:00:04 am +# Last Modified: Sunday, 16th January 2022 3:18:38 pm # Modified By: Console and webGui login account (jsunnex@gmail.com) ### @@ -58,6 +58,9 @@ chmod a+rwx /opt/scripts/*.sh # Start supervisord echo echo "**** Starting supervisord ****"; +echo "Logging all root services to `/var/log/supervisor/`" +echo "Logging all user services to `/home/${USER}/.cache/log/`" +echo mkdir -p /var/log/supervisor chmod a+rw /var/log/supervisor exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf --nodaemon --user root diff --git a/overlay/etc/supervisor/conf.d/dbus.conf b/overlay/etc/supervisor/conf.d/dbus.conf index 8a03acf..48a87b0 100644 --- a/overlay/etc/supervisor/conf.d/dbus.conf +++ b/overlay/etc/supervisor/conf.d/dbus.conf @@ -8,3 +8,9 @@ user=%(ENV_USER)s environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s" autorestart=true stopsignal=QUIT +stdout_logfile=/var/log/supervisor/dbus.log +stdout_logfile_maxbytes=10MB +stdout_logfile_backups=7 +stderr_logfile=/var/log/supervisor/dbus.err.log +stderr_logfile_maxbytes=10MB +stderr_logfile_backups=7 diff --git a/overlay/etc/supervisor/conf.d/pulseaudio.conf b/overlay/etc/supervisor/conf.d/pulseaudio.conf index 9f7379a..a27134e 100644 --- a/overlay/etc/supervisor/conf.d/pulseaudio.conf +++ b/overlay/etc/supervisor/conf.d/pulseaudio.conf @@ -1,12 +1,15 @@ [program:pulseaudio] autostart=true -priority=10 -directory=/ -command=/usr/bin/pulseaudio -vvvv --disallow-module-loading --disallow-exit --exit-idle-time=-1 -user=%(ENV_USER)s -environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s" autorestart=true +priority=10 +user=%(ENV_USER)s +command=/usr/bin/pulseaudio -vvvv --disallow-module-loading --disallow-exit --exit-idle-time=-1 +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s" stopsignal=QUIT stdout_logfile=/home/%(ENV_USER)s/.cache/log/pulseaudio.log -stderr_logfile=/home/%(ENV_USER)s/.cache/log/pulseaudio.err +stdout_logfile_maxbytes=10MB +stdout_logfile_backups=7 +stderr_logfile=/home/%(ENV_USER)s/.cache/log/pulseaudio.err.log +stderr_logfile_maxbytes=10MB +stderr_logfile_backups=7 diff --git a/overlay/etc/supervisor/conf.d/sshd.conf b/overlay/etc/supervisor/conf.d/sshd.conf index 82c2bc5..d21ef9a 100644 --- a/overlay/etc/supervisor/conf.d/sshd.conf +++ b/overlay/etc/supervisor/conf.d/sshd.conf @@ -1,11 +1,14 @@ -[program:ssh] +[program:sshd] autostart=true -priority=10 -directory=/ -command=/usr/sbin/sshd -Ddp 2222 -user=root autorestart=true +priority=10 +user=root +command=/usr/sbin/sshd -Ddp 2222 stopsignal=QUIT -stdout_logfile=/var/log/supervisor/xorg.log -stderr_logfile=/var/log/supervisor/xorg.err +stdout_logfile=/var/log/supervisor/sshd.log +stdout_logfile_maxbytes=10MB +stdout_logfile_backups=7 +stderr_logfile=/var/log/supervisor/sshd.err.log +stderr_logfile_maxbytes=10MB +stderr_logfile_backups=7 diff --git a/overlay/etc/supervisor/conf.d/steam.conf b/overlay/etc/supervisor/conf.d/steam.conf index 8d52ba1..04a4fb1 100644 --- a/overlay/etc/supervisor/conf.d/steam.conf +++ b/overlay/etc/supervisor/conf.d/steam.conf @@ -2,12 +2,16 @@ # Optionally launch directly to steam big picture (disabled by default) [program:steam] autostart=false +autorestart=true priority=50 +user=%(ENV_USER)s directory=/home/%(ENV_USER)s command=/usr/game/steam -bigpicture -user=%(ENV_USER)s -autorestart=true -stopsignal=QUIT environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" +stopsignal=QUIT stdout_logfile=/home/%(ENV_USER)s/.cache/log/steam.log -stderr_logfile=/home/%(ENV_USER)s/.cache/log/steam.err +stdout_logfile_maxbytes=10MB +stdout_logfile_backups=7 +stderr_logfile=/home/%(ENV_USER)s/.cache/log/steam.err.log +stderr_logfile_maxbytes=10MB +stderr_logfile_backups=7 diff --git a/overlay/etc/supervisor/conf.d/udev.conf b/overlay/etc/supervisor/conf.d/udev.conf index 53c0b6b..72c7b86 100644 --- a/overlay/etc/supervisor/conf.d/udev.conf +++ b/overlay/etc/supervisor/conf.d/udev.conf @@ -1,11 +1,15 @@ [program:udev] autostart=false +autorestart=true priority=10 +user=root directory=/ command=/usr/bin/start-udev.sh -user=root -autorestart=true stopsignal=QUIT stdout_logfile=/var/log/supervisor/udev.log -stderr_logfile=/var/log/supervisor/udev.err +stdout_logfile_maxbytes=10MB +stdout_logfile_backups=7 +stderr_logfile=/var/log/supervisor/udev.err.log +stderr_logfile_maxbytes=10MB +stderr_logfile_backups=7 diff --git a/overlay/etc/supervisor/conf.d/vnc-audio.conf b/overlay/etc/supervisor/conf.d/vnc-audio.conf index bec79df..f42928a 100644 --- a/overlay/etc/supervisor/conf.d/vnc-audio.conf +++ b/overlay/etc/supervisor/conf.d/vnc-audio.conf @@ -1,20 +1,28 @@ [program:audiostream] autostart=false -priority=10 -command=tcpserver localhost 5901 gst-launch-1.0 -q pulsesrc server=/tmp/pulseaudio.socket ! audio/x-raw, channels=2, rate=24000 ! cutter ! opusenc ! webmmux ! fdsink fd=1 -user=%(ENV_USER)s autorestart=true +priority=10 +user=%(ENV_USER)s +command=tcpserver localhost 5901 gst-launch-1.0 -q pulsesrc server=/tmp/pulseaudio.socket ! audio/x-raw, channels=2, rate=24000 ! cutter ! opusenc ! webmmux ! fdsink fd=1 stopsignal=QUIT stdout_logfile=/home/%(ENV_USER)s/.cache/log/audiostream.log -stderr_logfile=/home/%(ENV_USER)s/.cache/log/audiostream.err +stdout_logfile_maxbytes=10MB +stdout_logfile_backups=7 +stderr_logfile=/home/%(ENV_USER)s/.cache/log/audiostream.err.log +stderr_logfile_maxbytes=10MB +stderr_logfile_backups=7 [program:audiowebsock] autostart=false -priority=10 -command=/usr/local/bin/websockify 32123 localhost:5901 -user=%(ENV_USER)s autorestart=true +priority=10 +user=%(ENV_USER)s +command=/usr/local/bin/websockify 32123 localhost:5901 stopsignal=QUIT stdout_logfile=/home/%(ENV_USER)s/.cache/log/audiowebsock.log -stderr_logfile=/home/%(ENV_USER)s/.cache/log/audiowebsock.err +stdout_logfile_maxbytes=10MB +stdout_logfile_backups=7 +stderr_logfile=/home/%(ENV_USER)s/.cache/log/audiowebsock.err.log +stderr_logfile_maxbytes=10MB +stderr_logfile_backups=7 diff --git a/overlay/etc/supervisor/conf.d/vnc.conf b/overlay/etc/supervisor/conf.d/vnc.conf index a006476..d5d5b5f 100644 --- a/overlay/etc/supervisor/conf.d/vnc.conf +++ b/overlay/etc/supervisor/conf.d/vnc.conf @@ -1,19 +1,29 @@ [program:x11vnc] autostart=true -priority=30 -directory=/ -command=/usr/bin/x11vnc -display %(ENV_DISPLAY)s -rfbport 5900 -shared -forever -user=%(ENV_USER)s autorestart=true +priority=30 +user=%(ENV_USER)s +command=/usr/bin/x11vnc -display %(ENV_DISPLAY)s -rfbport 5900 -shared -forever stopsignal=QUIT stdout_logfile=/home/%(ENV_USER)s/.cache/log/x11vnc.log -stderr_logfile=/home/%(ENV_USER)s/.cache/log/x11vnc.err +stdout_logfile_maxbytes=10MB +stdout_logfile_backups=7 +stderr_logfile=/home/%(ENV_USER)s/.cache/log/x11vnc.err.log +stderr_logfile_maxbytes=10MB +stderr_logfile_backups=7 [program:novnc] autostart=true -priority=30 -command=/opt/noVNC/utils/launch.sh --vnc localhost:5900 --listen 8083 -user=%(ENV_USER)s -environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s" autorestart=true +priority=30 +user=%(ENV_USER)s +command=/opt/noVNC/utils/launch.sh --vnc localhost:5900 --listen 8083 +environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s" +stopsignal=QUIT +stdout_logfile=/home/%(ENV_USER)s/.cache/log/novnc.log +stdout_logfile_maxbytes=10MB +stdout_logfile_backups=7 +stderr_logfile=/home/%(ENV_USER)s/.cache/log/novnc.err.log +stderr_logfile_maxbytes=10MB +stderr_logfile_backups=7 diff --git a/overlay/etc/supervisor/conf.d/xfce4.conf b/overlay/etc/supervisor/conf.d/xfce4.conf index 7407276..1f4b7f8 100644 --- a/overlay/etc/supervisor/conf.d/xfce4.conf +++ b/overlay/etc/supervisor/conf.d/xfce4.conf @@ -1,12 +1,16 @@ [program:xfce4] autostart=true +autorestart=true priority=50 +user=%(ENV_USER)s directory=/home/%(ENV_USER)s command=/usr/bin/startxfce4 -user=%(ENV_USER)s -autorestart=true -stopsignal=QUIT environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" +stopsignal=QUIT stdout_logfile=/home/%(ENV_USER)s/.cache/log/xfce4.log -stderr_logfile=/home/%(ENV_USER)s/.cache/log/xfce4.err +stdout_logfile_maxbytes=10MB +stdout_logfile_backups=7 +stderr_logfile=/home/%(ENV_USER)s/.cache/log/xfce4.err.log +stderr_logfile_maxbytes=10MB +stderr_logfile_backups=7 diff --git a/overlay/etc/supervisor/conf.d/xorg.conf b/overlay/etc/supervisor/conf.d/xorg.conf index 7098927..1dae47f 100644 --- a/overlay/etc/supervisor/conf.d/xorg.conf +++ b/overlay/etc/supervisor/conf.d/xorg.conf @@ -1,12 +1,15 @@ [program:xorg] autostart=false -priority=20 -directory=/ -command=/usr/bin/start-xorg.sh -user=root -environment=DISPLAY="%(ENV_DISPLAY)s",DISPLAY_DPI="%(ENV_DISPLAY_DPI)s",XDG_RUNTIME_DIR="/tmp/.X11-unix" autorestart=true +priority=20 +user=root +command=/usr/bin/start-xorg.sh +environment=DISPLAY="%(ENV_DISPLAY)s",DISPLAY_DPI="%(ENV_DISPLAY_DPI)s",XDG_RUNTIME_DIR="/tmp/.X11-unix" stopsignal=QUIT stdout_logfile=/var/log/supervisor/xorg.log -stderr_logfile=/var/log/supervisor/xorg.err +stdout_logfile_maxbytes=10MB +stdout_logfile_backups=7 +stderr_logfile=/var/log/supervisor/xorg.err.log +stderr_logfile_maxbytes=10MB +stderr_logfile_backups=7