Skip to content

Commit

Permalink
chore: use /run for supervisor location
Browse files Browse the repository at this point in the history
It is the actual location, so make it consistent with volumes.
  • Loading branch information
nijel committed Aug 26, 2024
1 parent 415b4f5 commit a260396
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions etc/supervisor/supervisord.conf
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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

Expand All @@ -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
2 changes: 1 addition & 1 deletion start
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a260396

Please sign in to comment.