[supervisor.*.conf] Use env variable to dynamically set user based on…

… user running CKAN
wri · Jan 31, 2025 · b51ae00 · b51ae00
1 parent 5edc863
commit b51ae00
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 12 deletions.
diff --git a/ckan-backend-dev/ckan/setup/start_ckan.sh.override b/ckan-backend-dev/ckan/setup/start_ckan.sh.override
@@ -59,6 +59,7 @@ export SCRIPT_NAME="/private-admin"
 if [ $? -eq 0 ]
 then
     # Start supervisord
+    export ENV_SUPERVISOR_USER=$(whoami)
     supervisord --configuration /etc/supervisord.conf &
     # Start uwsgi
     sudo -u ckan -EH uwsgi $UWSGI_OPTS

diff --git a/ckan-backend-dev/ckan/setup/start_ckan_development.sh.override b/ckan-backend-dev/ckan/setup/start_ckan_development.sh.override
@@ -94,6 +94,7 @@ then
 fi
 
 # Start supervisord
+export ENV_SUPERVISOR_USER=$(whoami)
 supervisord --configuration /etc/supervisord.conf &
 
 # Start the development server with automatic reload

diff --git a/ckan-backend-dev/ckan/setup/supervisor.harvest.conf b/ckan-backend-dev/ckan/setup/supervisor.harvest.conf
@@ -8,8 +8,8 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stdout
 stderr_logfile_maxbytes=0
-user=ckan
-environment=HOME="/srv/app",USER="ckan"
+user=%(ENV_SUPERVISOR_USER)s
+environment=HOME="/srv/app",USER="%(ENV_SUPERVISOR_USER)s"
 
 
 [program:ckan-gather]
@@ -22,5 +22,5 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stdout
 stderr_logfile_maxbytes=0
-user=ckan
-environment=HOME="/srv/app",USER="ckan"
+user=%(ENV_SUPERVISOR_USER)s
+environment=HOME="/srv/app",USER="%(ENV_SUPERVISOR_USER)s"
diff --git a/ckan-backend-dev/ckan/setup/supervisor.worker.conf b/ckan-backend-dev/ckan/setup/supervisor.worker.conf
@@ -8,5 +8,5 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stdout
 stderr_logfile_maxbytes=0
-user=ckan
-environment=HOME="/srv/app",USER="ckan"
+user=%(ENV_SUPERVISOR_USER)s
+environment=HOME="/srv/app",USER="%(ENV_SUPERVISOR_USER)s"
diff --git a/deployment/ckan/setup/start_ckan.sh.override b/deployment/ckan/setup/start_ckan.sh.override
@@ -39,6 +39,7 @@ export SCRIPT_NAME="/private-admin"
 if [ $? -eq 0 ]
 then
     # Start supervisord
+    export ENV_SUPERVISOR_USER=$(whoami)
     supervisord --configuration /etc/supervisord.conf &
     # Start uwsgi
     uwsgi $UWSGI_OPTS

diff --git a/deployment/ckan/setup/start_ckan_development.sh.override b/deployment/ckan/setup/start_ckan_development.sh.override
@@ -93,6 +93,7 @@ then
 fi
 
 # Start supervisord
+export ENV_SUPERVISOR_USER=$(whoami)
 supervisord --configuration /etc/supervisord.conf &
 
 # Start the development server with automatic reload

diff --git a/deployment/ckan/setup/supervisor.harvest.conf b/deployment/ckan/setup/supervisor.harvest.conf
@@ -8,8 +8,8 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stdout
 stderr_logfile_maxbytes=0
-user=root
-environment=HOME="/srv/app",USER="root"
+user=%(ENV_SUPERVISOR_USER)s
+environment=HOME="/srv/app",USER="%(ENV_SUPERVISOR_USER)s"
 
 
 [program:ckan-gather]
@@ -22,5 +22,5 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stdout
 stderr_logfile_maxbytes=0
-user=root
-environment=HOME="/srv/app",USER="root"
+user=%(ENV_SUPERVISOR_USER)s
+environment=HOME="/srv/app",USER="%(ENV_SUPERVISOR_USER)s"
diff --git a/deployment/ckan/setup/supervisor.worker.conf b/deployment/ckan/setup/supervisor.worker.conf
@@ -8,5 +8,5 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stdout
 stderr_logfile_maxbytes=0
-user=ckan
-environment=HOME="/srv/app",USER="ckan"
+user=%(ENV_SUPERVISOR_USER)s
+environment=HOME="/srv/app",USER="%(ENV_SUPERVISOR_USER)s"