Mise à jour de 'supervisord.conf'

supervisord.conf

@@ -16,34 +16,32 @@ supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
 serverurl=unix:///tmp/supervisor.sock
 
 
+; =============================================================================
+; Xorg + XFCE
+;
+; Keep the program name "entrypoint": sunshine-entrypoint.sh intentionally
+; restarts this Supervisor program after Sunshine creates its uinput devices.
+; =============================================================================
+
 [program:entrypoint]
-command=/usr/bin/dbus-run-session -- /etc/entrypoint.sh
+command=/usr/bin/dbus-run-session -- /etc/desktop-entrypoint.sh
+environment=HOME="/home/ubuntu",USER="ubuntu",DISPLAY="%(ENV_DISPLAY)s",XDG_RUNTIME_DIR="%(ENV_XDG_RUNTIME_DIR)s",PIPEWIRE_RUNTIME_DIR="%(ENV_PIPEWIRE_RUNTIME_DIR)s",PULSE_RUNTIME_PATH="%(ENV_PULSE_RUNTIME_PATH)s",PULSE_SERVER="%(ENV_PULSE_SERVER)s"
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
 stopasgroup=true
 killasgroup=true
-stopsignal=INT
+stopsignal=TERM
 autostart=true
 autorestart=true
+startsecs=1
 startretries=20
-priority=1
+priority=5
 
 
-[program:dbus]
-command=/bin/bash -c 'install -d -m 0700 "${XDG_RUNTIME_DIR}" && exec dbus-daemon --system --nofork --nosyslog --nopidfile --address="${DBUS_SYSTEM_BUS_ADDRESS}"'
-environment=DISPLAY="%(ENV_DISPLAY)s",XDG_RUNTIME_DIR="%(ENV_XDG_RUNTIME_DIR)s",DBUS_SYSTEM_BUS_ADDRESS="%(ENV_DBUS_SYSTEM_BUS_ADDRESS)s"
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-redirect_stderr=true
-stopasgroup=true
-killasgroup=true
-stopsignal=INT
-autostart=true
-autorestart=true
-startretries=20
-priority=1
-
+; =============================================================================
+; PipeWire
+; =============================================================================
 
 [group:pipewire-group]
 programs=pipewire,wireplumber,pipewire-pulse
@@ -52,7 +50,7 @@ priority=10
 
 [program:pipewire]
 command=/bin/bash -c 'until [ -S "/tmp/.X11-unix/X${DISPLAY#*:}" ]; do sleep 0.5; done; exec dbus-run-session -- /usr/bin/pipewire'
-environment=PIPEWIRE_LATENCY="128/48000",DISPLAY="%(ENV_DISPLAY)s",DISABLE_RTKIT="y",XDG_RUNTIME_DIR="%(ENV_XDG_RUNTIME_DIR)s",DBUS_SYSTEM_BUS_ADDRESS="%(ENV_DBUS_SYSTEM_BUS_ADDRESS)s",PIPEWIRE_RUNTIME_DIR="%(ENV_XDG_RUNTIME_DIR)s",PULSE_RUNTIME_PATH="%(ENV_XDG_RUNTIME_DIR)s/pulse"
+environment=HOME="/home/ubuntu",USER="ubuntu",PIPEWIRE_LATENCY="128/48000",DISPLAY="%(ENV_DISPLAY)s",DISABLE_RTKIT="y",XDG_RUNTIME_DIR="%(ENV_XDG_RUNTIME_DIR)s",PIPEWIRE_RUNTIME_DIR="%(ENV_PIPEWIRE_RUNTIME_DIR)s",PULSE_RUNTIME_PATH="%(ENV_PULSE_RUNTIME_PATH)s",PULSE_SERVER="%(ENV_PULSE_SERVER)s"
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
@@ -61,12 +59,13 @@ killasgroup=true
 stopsignal=INT
 autostart=true
 autorestart=true
+startsecs=1
 startretries=20
 
 
 [program:wireplumber]
 command=/bin/bash -c 'until compgen -G "${XDG_RUNTIME_DIR}/pipewire-*.lock" >/dev/null; do sleep 0.5; done; exec dbus-run-session -- /usr/bin/wireplumber'
-environment=PIPEWIRE_LATENCY="128/48000",DISPLAY="%(ENV_DISPLAY)s",DISABLE_RTKIT="y",XDG_RUNTIME_DIR="%(ENV_XDG_RUNTIME_DIR)s",DBUS_SYSTEM_BUS_ADDRESS="%(ENV_DBUS_SYSTEM_BUS_ADDRESS)s",PIPEWIRE_RUNTIME_DIR="%(ENV_XDG_RUNTIME_DIR)s",PULSE_RUNTIME_PATH="%(ENV_XDG_RUNTIME_DIR)s/pulse"
+environment=HOME="/home/ubuntu",USER="ubuntu",PIPEWIRE_LATENCY="128/48000",DISPLAY="%(ENV_DISPLAY)s",DISABLE_RTKIT="y",XDG_RUNTIME_DIR="%(ENV_XDG_RUNTIME_DIR)s",PIPEWIRE_RUNTIME_DIR="%(ENV_PIPEWIRE_RUNTIME_DIR)s",PULSE_RUNTIME_PATH="%(ENV_PULSE_RUNTIME_PATH)s",PULSE_SERVER="%(ENV_PULSE_SERVER)s"
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
@@ -75,12 +74,13 @@ killasgroup=true
 stopsignal=INT
 autostart=true
 autorestart=true
+startsecs=1
 startretries=20
 
 
 [program:pipewire-pulse]
 command=/bin/bash -c 'until compgen -G "${XDG_RUNTIME_DIR}/pipewire-*.lock" >/dev/null; do sleep 0.5; done; exec dbus-run-session -- /usr/bin/pipewire-pulse'
-environment=PIPEWIRE_LATENCY="128/48000",DISPLAY="%(ENV_DISPLAY)s",DISABLE_RTKIT="y",XDG_RUNTIME_DIR="%(ENV_XDG_RUNTIME_DIR)s",DBUS_SYSTEM_BUS_ADDRESS="%(ENV_DBUS_SYSTEM_BUS_ADDRESS)s",PIPEWIRE_RUNTIME_DIR="%(ENV_XDG_RUNTIME_DIR)s",PULSE_RUNTIME_PATH="%(ENV_XDG_RUNTIME_DIR)s/pulse"
+environment=HOME="/home/ubuntu",USER="ubuntu",PIPEWIRE_LATENCY="128/48000",DISPLAY="%(ENV_DISPLAY)s",DISABLE_RTKIT="y",XDG_RUNTIME_DIR="%(ENV_XDG_RUNTIME_DIR)s",PIPEWIRE_RUNTIME_DIR="%(ENV_PIPEWIRE_RUNTIME_DIR)s",PULSE_RUNTIME_PATH="%(ENV_PULSE_RUNTIME_PATH)s",PULSE_SERVER="%(ENV_PULSE_SERVER)s"
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
@@ -89,4 +89,5 @@ killasgroup=true
 stopsignal=INT
 autostart=true
 autorestart=true
-startretries=20
+startsecs=1
+startretries=20