zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-03-20 07:43:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

redirect if no forward-slash

Browse Source
This commit is contained in:
Wayne Witzel III
2016-12-12 13:06:42 -05:00
parent c6e1598b9c
commit 19f7d9e8d8
2 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/awx-nginx.conf
View File

@@ -87,6 +87,8 @@ http {
} }
location / { location / {
# Redirect if there is no forward-slash
rewrite ^(.*[^/])$ $1/ permanent;
uwsgi_read_timeout 120s; uwsgi_read_timeout 120s;
uwsgi_pass uwsgi; uwsgi_pass uwsgi;
include /etc/nginx/uwsgi_params; include /etc/nginx/uwsgi_params;

66
tools/docker-compose/nginx.vh.default.conf
View File

@@ -7,20 +7,20 @@ upstream daphne {
} }
server { server {
listen 8013 default_server; listen 8013 default_server;
listen [::]:8013 default_server; listen [::]:8013 default_server;
return 301 https://$host:8043$request_uri; return 301 https://$host:8043$request_uri;
} }
server { server {
listen 8043 default_server ssl; listen 8043 default_server ssl;
# If you have a domain name, this is where to add it # If you have a domain name, this is where to add it
server_name _; server_name _;
keepalive_timeout 65; keepalive_timeout 65;
ssl_certificate /etc/nginx/nginx.crt; ssl_certificate /etc/nginx/nginx.crt;
ssl_certificate_key /etc/nginx/nginx.key; ssl_certificate_key /etc/nginx/nginx.key;
ssl_session_timeout 1d; ssl_session_timeout 1d;
ssl_session_cache shared:SSL:50m; ssl_session_cache shared:SSL:50m;
@@ -41,31 +41,33 @@ server {
sendfile off; sendfile off;
} }
location /websocket { location /websocket {
# Pass request to the upstream alias # Pass request to the upstream alias
proxy_pass http://daphne; proxy_pass http://daphne;
# Require http version 1.1 to allow for upgrade requests # Require http version 1.1 to allow for upgrade requests
proxy_http_version 1.1; proxy_http_version 1.1;
# We want proxy_buffering off for proxying to websockets. # We want proxy_buffering off for proxying to websockets.
proxy_buffering off; proxy_buffering off;
# http://en.wikipedia.org/wiki/X-Forwarded-For # http://en.wikipedia.org/wiki/X-Forwarded-For
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# enable this if you use HTTPS: # enable this if you use HTTPS:
proxy_set_header X-Forwarded-Proto https; proxy_set_header X-Forwarded-Proto https;
# pass the Host: header from the client for the sake of redirects # pass the Host: header from the client for the sake of redirects
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
# We've set the Host header, so we don't need Nginx to muddle # We've set the Host header, so we don't need Nginx to muddle
# about with redirects # about with redirects
proxy_redirect off; proxy_redirect off;
# Depending on the request value, set the Upgrade and # Depending on the request value, set the Upgrade and
# connection headers # connection headers
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade; proxy_set_header Connection $connection_upgrade;
} }
location / { location / {
# Add trailing / if missing
rewrite ^(.*[^/])$ $1/ permanent;
uwsgi_read_timeout 120s; uwsgi_read_timeout 120s;
uwsgi_pass uwsgi; uwsgi_pass uwsgi;
include /etc/nginx/uwsgi_params; include /etc/nginx/uwsgi_params;
} }
} }