From f218375ea0311649a3f2341ae62af828bf85bafb Mon Sep 17 00:00:00 2001 From: Nikita Manovich Date: Sat, 25 Apr 2020 17:57:37 +0300 Subject: [PATCH 1/2] Fix Network Error after PC Restart (#1035) --- supervisord.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/supervisord.conf b/supervisord.conf index d5e222d2a99b..706f3ec871df 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -54,9 +54,11 @@ numprocs=1 ; with docker cache. Thus it is necessary to run collectstatic here for such ; apps. command=%(ENV_HOME)s/wait-for-it.sh db:5432 -t 0 -- bash -ic \ - "/usr/bin/python3 ~/manage.py migrate && \ + "rm -f /tmp/cvat-server/httpd.pid && /usr/bin/python3 ~/manage.py migrate && \ /usr/bin/python3 ~/manage.py collectstatic --no-input && \ exec /usr/bin/python3 $HOME/manage.py runmodwsgi --log-to-terminal --port 8080 \ --limit-request-body 1073741824 --log-level INFO --include-file ~/mod_wsgi.conf \ - %(ENV_DJANGO_MODWSGI_EXTRA_ARGS)s --locale %(ENV_LC_ALL)s" + %(ENV_DJANGO_MODWSGI_EXTRA_ARGS)s --locale %(ENV_LC_ALL)s \ + --server-root /tmp/cvat-server" + environment=SSH_AUTH_SOCK="/tmp/ssh-agent.sock" From 1588b6f386d8c68316066fa87fefeb5aaf365f25 Mon Sep 17 00:00:00 2001 From: Nikita Manovich Date: Sat, 25 Apr 2020 18:16:20 +0300 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb533494cb3c..9269b9e7237d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Duplicating keypoints in COCO export (https://github.com/opencv/cvat/pull/1435) - CVAT new UI: add arrows on a mouse cursor () - Delete point bug (in new UI) () +- Fix apache startup after PC restart (https://github.com/opencv/cvat/pull/1467) ### Security -