From 99ea3371f7bddcb319d0bdf5b23f4e725e9280bb Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 10 Jul 2024 15:16:07 +0200
Subject: [PATCH] wait #6995 @2

---
 .../{ => conf.d}/default-worker.conf          |  0
 .../{ => conf.d}/download-worker.conf         |  0
 .../fluidbook-process-worker.conf             |  0
 .../{ => conf.d}/medialibrary-worker.conf     |  0
 .../supervisor/{ => conf.d}/theme-worker.conf |  0
 .../supervisor/{ => conf.d}/ws2-worker.conf   |  0
 .docker/config/supervisor/supervisord.conf    | 29 +++++++++++++++++++
 .docker/docker-compose.yml                    |  2 +-
 8 files changed, 30 insertions(+), 1 deletion(-)
 rename .docker/config/supervisor/{ => conf.d}/default-worker.conf (100%)
 rename .docker/config/supervisor/{ => conf.d}/download-worker.conf (100%)
 rename .docker/config/supervisor/{ => conf.d}/fluidbook-process-worker.conf (100%)
 rename .docker/config/supervisor/{ => conf.d}/medialibrary-worker.conf (100%)
 rename .docker/config/supervisor/{ => conf.d}/theme-worker.conf (100%)
 rename .docker/config/supervisor/{ => conf.d}/ws2-worker.conf (100%)
 create mode 100644 .docker/config/supervisor/supervisord.conf

diff --git a/.docker/config/supervisor/default-worker.conf b/.docker/config/supervisor/conf.d/default-worker.conf
similarity index 100%
rename from .docker/config/supervisor/default-worker.conf
rename to .docker/config/supervisor/conf.d/default-worker.conf
diff --git a/.docker/config/supervisor/download-worker.conf b/.docker/config/supervisor/conf.d/download-worker.conf
similarity index 100%
rename from .docker/config/supervisor/download-worker.conf
rename to .docker/config/supervisor/conf.d/download-worker.conf
diff --git a/.docker/config/supervisor/fluidbook-process-worker.conf b/.docker/config/supervisor/conf.d/fluidbook-process-worker.conf
similarity index 100%
rename from .docker/config/supervisor/fluidbook-process-worker.conf
rename to .docker/config/supervisor/conf.d/fluidbook-process-worker.conf
diff --git a/.docker/config/supervisor/medialibrary-worker.conf b/.docker/config/supervisor/conf.d/medialibrary-worker.conf
similarity index 100%
rename from .docker/config/supervisor/medialibrary-worker.conf
rename to .docker/config/supervisor/conf.d/medialibrary-worker.conf
diff --git a/.docker/config/supervisor/theme-worker.conf b/.docker/config/supervisor/conf.d/theme-worker.conf
similarity index 100%
rename from .docker/config/supervisor/theme-worker.conf
rename to .docker/config/supervisor/conf.d/theme-worker.conf
diff --git a/.docker/config/supervisor/ws2-worker.conf b/.docker/config/supervisor/conf.d/ws2-worker.conf
similarity index 100%
rename from .docker/config/supervisor/ws2-worker.conf
rename to .docker/config/supervisor/conf.d/ws2-worker.conf
diff --git a/.docker/config/supervisor/supervisord.conf b/.docker/config/supervisor/supervisord.conf
new file mode 100644
index 000000000..1e4836566
--- /dev/null
+++ b/.docker/config/supervisor/supervisord.conf
@@ -0,0 +1,29 @@
+; supervisor config file
+
+[unix_http_server]
+file=/var/run/supervisor.sock   ; (the path to the socket file)
+chmod=0700                       ; sockef file mode (default 0700)
+
+[supervisord]
+logfile=/var/log/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/tmp            ; ('AUTO' child log dir, default $TEMP)
+user=root   ;
+
+; the below section must remain in the config file for RPC
+; (supervisorctl/web interface) to work, additional interfaces may be
+; added by defining them in separate rpcinterface: sections
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+
+; The [include] section can just contain the "files" setting.  This
+; setting can list multiple files (separated by whitespace or
+; newlines).  It can also contain wildcards.  The filenames are
+; interpreted as relative to this file.  Included files *cannot*
+; include files themselves.
+
+[include]
+files = /etc/supervisor/conf.d/*.conf
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index fb89dbcac..e91d5a667 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       - '/home/toolbox/www/.docker/config/rsyslog/rsyslog.conf:/etc/rsyslog.conf'
       - '/home/toolbox/www/.docker/config/rsyslog/50-default.conf:/etc/rsyslog.d/50-default.conf'
       # Supervisor
-      - '/home/toolbox/www/.docker/config/supervisor/:/etc/supervisor/conf.d/'
+      - '/home/toolbox/www/.docker/config/supervisor/:/etc/supervisor/'
       # Composer
       - '/home/toolbox/www/.docker/config/composer/:/root/.config/composer/'
       - '/home/toolbox/www/.docker/config/composer/:/application/.config/composer/'
-- 
2.39.5