From 3d4e7268e175557543932de115e0d7c03fae9e43 Mon Sep 17 00:00:00 2001
From: Nikita Manovich <40690625+nmanovic@users.noreply.github.com>
Date: Mon, 27 Apr 2020 23:18:15 +0300
Subject: [PATCH] Fix apache startup (#1467)

* Fix Network Error after PC Restart (#1035)
* Update CHANGELOG.md
---
 CHANGELOG.md     | 1 +
 supervisord.conf | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aeb31f48..0bb8a898 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 (<https://github.com/opencv/cvat/pull/1391>)
 - Delete point bug (in new UI) (<https://github.com/opencv/cvat/pull/1440>)
+- Fix apache startup after PC restart (https://github.com/opencv/cvat/pull/1467)
 
 ### Security
 -
diff --git a/supervisord.conf b/supervisord.conf
index d5e222d2..706f3ec8 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"