Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added django-rq to the proxy match pattern. #2069

Merged
merged 3 commits into from
Aug 24, 2020
Merged

Added django-rq to the proxy match pattern. #2069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e75483
added django-rq to the match pattern. Remoed unused locations from th…
Aug 24, 2020
48d5e71
updated changelog
Aug 24, 2020
fa726c3
updated installation guide
Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
-
Expand Down
15 changes: 1 addition & 14 deletions cvat/apps/documentation/installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
```

Expand Down
15 changes: 1 addition & 14 deletions cvat_proxy/conf.d/cvat.conf.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(?:/(.*))? {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@azhavoro , I believe we have a duplication of the file in documentation. Could you please update all places?

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;
}
}