From 0c8bc97fae1b02ad725a9ff575dec1c97f0f7d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= Date: Thu, 1 Jun 2023 10:20:30 -0400 Subject: [PATCH] Fix UI on Linux not using the right user --- src/linux/scripts/bunkerweb-ui.sh | 2 +- src/ui/Dockerfile | 2 +- src/ui/gunicorn.conf.py | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/linux/scripts/bunkerweb-ui.sh b/src/linux/scripts/bunkerweb-ui.sh index 63df473ed..fa6010c3e 100755 --- a/src/linux/scripts/bunkerweb-ui.sh +++ b/src/linux/scripts/bunkerweb-ui.sh @@ -15,7 +15,7 @@ start() { echo "Starting UI" source /etc/bunkerweb/ui.env export $(cat /etc/bunkerweb/ui.env) - python3 -m gunicorn --config /usr/share/bunkerweb/ui/gunicorn.conf.py main:app --bind 127.0.0.1:7000 & + python3 -m gunicorn --config /usr/share/bunkerweb/ui/gunicorn.conf.py & echo $! > /var/run/bunkerweb/ui.pid } diff --git a/src/ui/Dockerfile b/src/ui/Dockerfile index 63e903d7d..dced23cb9 100755 --- a/src/ui/Dockerfile +++ b/src/ui/Dockerfile @@ -80,4 +80,4 @@ USER ui:ui HEALTHCHECK --interval=10s --timeout=10s --start-period=30s --retries=6 CMD /usr/share/bunkerweb/helpers/healthcheck-ui.sh ENV PYTHONPATH /usr/share/bunkerweb/deps/python -CMD ["python3", "-m", "gunicorn", "--config", "/usr/share/bunkerweb/ui/gunicorn.conf.py", "--bind", "0.0.0.0:7000"] +CMD ["python3", "-m", "gunicorn", "--config", "/usr/share/bunkerweb/ui/gunicorn.conf.py", "--user", "ui", "--group", "ui", "--bind", "0.0.0.0:7000"] diff --git a/src/ui/gunicorn.conf.py b/src/ui/gunicorn.conf.py index 6fd51c2a6..042688b89 100644 --- a/src/ui/gunicorn.conf.py +++ b/src/ui/gunicorn.conf.py @@ -10,8 +10,8 @@ access_log_format = ( errorlog = "-" preload_app = True pidfile = join(sep, "var", "run", "bunkerweb", "ui.pid") -user = "ui" -group = "ui" +user = "nginx" +group = "nginx" secure_scheme_headers = { "X-FORWARDED-PROTOCOL": "https", "X-FORWARDED-PROTO": "https", @@ -19,5 +19,6 @@ secure_scheme_headers = { } forwarded_allow_ips = "*" proxy_allow_ips = "*" +bind = ["127.0.0.1:7000"] worker_class = "gevent" graceful_timeout = 0