From 4e75483f5d5e132564cb082332e22b49cc012841 Mon Sep 17 00:00:00 2001 From: Andrey Zhavoronkov Date: Mon, 24 Aug 2020 11:26:38 +0300 Subject: [PATCH 1/3] added django-rq to the match pattern. Remoed unused locations from the config. --- cvat_proxy/conf.d/cvat.conf.template | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/cvat_proxy/conf.d/cvat.conf.template b/cvat_proxy/conf.d/cvat.conf.template index 287f72849d7e..bd46d38a8f40 100644 --- 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; - } } From 48d5e71a2f9d192165efa1e7c47e81565afedfbb Mon Sep 17 00:00:00 2001 From: Andrey Zhavoronkov Date: Mon, 24 Aug 2020 11:39:04 +0300 Subject: [PATCH 2/3] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d8ea49e03c4..47964aca6098 100644 --- 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 () - Basic functions of CVAT works without activated nuclio dashboard - Fixed error with creating task with labels with the same name () +- Django RQ dashboard view () ### Security - From fa726c32a569c7602cbb9b39f08bd1bc03e48e9e Mon Sep 17 00:00:00 2001 From: Andrey Zhavoronkov Date: Mon, 24 Aug 2020 12:21:43 +0300 Subject: [PATCH 3/3] updated installation guide --- cvat/apps/documentation/installation.md | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/cvat/apps/documentation/installation.md b/cvat/apps/documentation/installation.md index 1741a16b1430..dc37a02525a3 100644 --- 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; - } } ```