External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_3.3.0' into devel

Browse Source
This commit is contained in:
Matthew Jones
2018-05-17 16:07:47 -04:00
parent 0bbc08e587 2e0125037a
commit 72f2994cc5
321 changed files with 8920 additions and 6224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
installer/roles/image_build/files/nginx.conf
View File

@@ -56,7 +56,7 @@ http {
location /favicon.ico { alias /var/lib/awx/public/static/favicon.ico; }
location /websocket {
location ~ ^/(websocket|network_ui/topology/) {
# Pass request to the upstream alias
proxy_pass http://daphne;
# Require http version 1.1 to allow for upgrade requests