Added django-rq to the proxy match pattern. (cvat-ai#2069)

* added django-rq to the match pattern. Remoed unused locations from the config. * updated changelog * updated installation guide
coveraver · Aug 24, 2020 · 1907b79 · 1907b79
1 parent 3fb3f67
commit 1907b79
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Issue loading openvino models for semi-automatic and automatic annotation (<https://github.com/opencv/cvat/pull/1996>)
 - Basic functions of CVAT works without activated nuclio dashboard
 - Fixed error with creating task with labels with the same name (<https://github.com/opencv/cvat/pull/2031>)
+- Django RQ dashboard view (<https://github.com/opencv/cvat/pull/2069>)
 
 ### Security
 -

diff --git a/cvat/apps/documentation/installation.md b/cvat/apps/documentation/installation.md
@@ -569,26 +569,13 @@ server {
     proxy_set_header        Host $http_host;
     proxy_pass_header       Set-Cookie;
 
-    location ~* /api/.*|git/.*|analytics/.*|static/.*|admin|admin/.*|documentation/.*  {
+    location ~* /api/.*|git/.*|analytics/.*|static/.*|admin(?:/(.*))?.*|documentation/.*|django-rq(?:/(.*))? {
         proxy_pass              http://cvat:8080;
     }
 
-    # workaround for match location by arguments
-    location = / {
-        error_page 418 = @annotation_ui;
-
-        if ( $query_string ~ "^id=\d+.*" ) { return 418; }
-        proxy_pass              http://cvat_ui;
-    }
-
     location / {
         proxy_pass              http://cvat_ui;
     }
-
-    # old annotation ui, will be removed in the future.
-    location @annotation_ui {
-        proxy_pass              http://cvat:8080;
-    }
 }
 ```
 

diff --git a/cvat_proxy/conf.d/cvat.conf.template b/cvat_proxy/conf.d/cvat.conf.template
@@ -12,24 +12,11 @@ server {
     proxy_set_header        Host $http_host;
     proxy_pass_header       Set-Cookie;
 
-    location ~* /api/.*|git/.*|analytics/.*|static/.*|admin|admin/.*|documentation/.*  {
+    location ~* /api/.*|git/.*|analytics/.*|static/.*|admin(?:/(.*))?.*|documentation/.*|django-rq(?:/(.*))? {
         proxy_pass              http://cvat:8080;
     }
 
-    # workaround for match location by arguments
-    location = / {
-        error_page 418 = @annotation_ui;
-
-        if ( $query_string ~ "^id=\d+.*" ) { return 418; }
-        proxy_pass              http://cvat_ui;
-    }
-
     location / {
         proxy_pass              http://cvat_ui;
     }
-
-    # old annotation ui, will be removed in the future.
-    location @annotation_ui {
-        proxy_pass              http://cvat:8080;
-    }
 }