Skip to content
Snippets Groups Projects
Commit aeb76250 authored by Pablo Panero Vazquez's avatar Pablo Panero Vazquez
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
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment