From a2603965ee5c99155baeb15267f353bfb51c3e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 26 Aug 2024 12:35:10 +0200
Subject: [PATCH] chore: use /run for supervisor location

It is the actual location, so make it consistent with volumes.
---
 etc/supervisor/supervisord.conf | 8 ++++----
 start                           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/etc/supervisor/supervisord.conf b/etc/supervisor/supervisord.conf
index c91265f07..3e34996df 100644
--- a/etc/supervisor/supervisord.conf
+++ b/etc/supervisor/supervisord.conf
@@ -1,7 +1,7 @@
 ; supervisor config file
 
 [unix_http_server]
-file=/var/run/supervisor.sock   ; (the path to the socket file)
+file=/run/supervisor.sock   ; (the path to the socket file)
 chmod=0700                       ; sockef file mode (default 0700)
 ; The only purpose of this file is to silent "CRITICAL" error
 ; when starting up, see https://github.com/Supervisor/supervisor/issues/694
@@ -10,7 +10,7 @@ password = dummy
 
 [supervisord]
 logfile=/dev/null ; (main log file;default $CWD/supervisord.log)
-pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+pidfile=/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
 
 ; the below section must remain in the config file for RPC
 ; (supervisorctl/web interface) to work, additional interfaces may be
@@ -19,7 +19,7 @@ pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [supervisorctl]
-serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+serverurl=unix:///run/supervisor.sock ; use a unix:// URL  for a unix socket
 username = dummy
 password = dummy
 
@@ -36,4 +36,4 @@ events = PROCESS_LOG
 result_handler = supervisor_stdout:event_handler
 
 [include]
-files = /var/run/supervisor.conf.d/*.conf
+files = /run/supervisor.conf.d/*.conf
diff --git a/start b/start
index 74ea85532..2ae8cf67c 100755
--- a/start
+++ b/start
@@ -199,7 +199,7 @@ if [ "$1" = "runserver" ] ; then
 
     DO_MIGRATE=1
     # Select which services to run
-    SUPERVISOR_CONF=/var/run/supervisor.conf.d/
+    SUPERVISOR_CONF=/run/supervisor.conf.d/
     mkdir -p "$SUPERVISOR_CONF"
     if [ -n "$WEBLATE_SERVICE" ] ; then
         if [ "$WEBLATE_SERVICE" != "celery-beat" ] ; then