Implement alternate ports for nginx

* This also allows disabling https mode in the nginx configuration
* Reconfigure the development container to not specifically require
  https, so the haproxy cluster configuration can work
This commit is contained in:
Matthew Jones
2017-01-23 14:34:15 -05:00
parent 483fbb6f24
commit 8a9b2fcaea
2 changed files with 44 additions and 125 deletions

View File

@@ -6,11 +6,52 @@ upstream daphne {
server localhost:8051;
}
# server {
# listen 8013 default_server;
# listen [::]:8013 default_server;
# server_name _;
# return 301 https://$host:8043$request_uri;
# }
server {
listen 8013;
listen [::]:8013;
server_name localhost 127.0.0.1;
listen 8013 default_server;
# If you have a domain name, this is where to add it
server_name _;
keepalive_timeout 65;
# HSTS (ngx_http_headers_module is required) (15768000 seconds = 6 months)
add_header Strict-Transport-Security max-age=15768000;
location /static/ {
root /tower_devel;
try_files /awx/ui/$uri /awx/$uri /awx/public/$uri =404;
access_log off;
sendfile off;
}
location /websocket {
# Pass request to the upstream alias
proxy_pass http://daphne;
# Require http version 1.1 to allow for upgrade requests
proxy_http_version 1.1;
# We want proxy_buffering off for proxying to websockets.
proxy_buffering off;
# http://en.wikipedia.org/wiki/X-Forwarded-For
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# enable this if you use HTTPS:
proxy_set_header X-Forwarded-Proto https;
# pass the Host: header from the client for the sake of redirects
proxy_set_header Host $http_host;
# We've set the Host header, so we don't need Nginx to muddle
# about with redirects
proxy_redirect off;
# Depending on the request value, set the Upgrade and
# connection headers
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
}
location / {
# Add trailing / if missing
rewrite ^(.*[^/])$ $1/ permanent;
@@ -20,13 +61,6 @@ server {
}
}
server {
listen 8013 default_server;
listen [::]:8013 default_server;
server_name _;
return 301 https://$host:8043$request_uri;
}
server {
listen 8043 default_server ssl;