Commit aeb76250 authored by Pablo Panero's avatar Pablo Panero
Browse files

Merge branch 'theme' into 'master'

Changed rewrite to avoid port in the URL and infinite loop when in OpenShift

See merge request ppanero/cern_search_rest!16
parents ef6c44ab 69690d29
......@@ -20,10 +20,10 @@ http {
listen 8080 ssl;
ssl_certificate /etc/nginx/tls/tls.crt;
ssl_certificate_key /etc/nginx/tls/tls.key;
rewrite ^/$ /account/settings/applications/;
# Proxying connections to application servers
location / {
rewrite ^/$ /account/settings/applications/ redirect;
include uwsgi_params;
uwsgi_pass uwsgicluster;
......
......@@ -304,10 +304,10 @@ objects:
listen 8080 ssl;
ssl_certificate /etc/nginx/tls/tls.crt;
ssl_certificate_key /etc/nginx/tls/tls.key;
rewrite ^/$ /account/settings/applications/;
# Proxying connections to application servers
location / {
rewrite ^/$ /account/settings/applications/ redirect;
include uwsgi_params;
uwsgi_pass cern-search-api:5000;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment