diff --git a/scripts/custom.config.sh b/scripts/custom.config.sh index 60f143f62131f2350ddfc3c071c20236abc4473a..fc96e1983cbd30d045e3996a02f3aeb2f5caea72 100644 --- a/scripts/custom.config.sh +++ b/scripts/custom.config.sh @@ -2,11 +2,7 @@ export SITE_URL="${SITE_URL_PREFIX}geomag${SITE_URL_SUFFIX}"; export BASE_HREF=${BASE_HREF:-ws}; export SERVICE_MAP=( - "/ws/docs:web" - "/ws/data:web" - "/ws/elements:web" - "/ws/metadata:web" - "/ws/observatories:web" + "/${BASE_HREF}:web" ); # Algorithms Environment Variables export DATA_HOST=${DATA_HOST:-cwbpub.cr.usgs.gov}; diff --git a/scripts/custom.funcs.sh b/scripts/custom.funcs.sh index 23a8f97301ca95b7a117520d7fe56885e554aeb5..eced92e7268632cd431d5256cebf8f30821b556a 100644 --- a/scripts/custom.funcs.sh +++ b/scripts/custom.funcs.sh @@ -52,8 +52,8 @@ updateRouting () { proxy_set_header X-Client-IP \$remote_addr; proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto https; - # clean up any redirects sent by proxy - proxy_redirect http://\$proxy_host${path} https://\$host${path}; + # keep redirects on https + proxy_redirect http://\$host:\$port https://\$host; } EO_SERVER_SNIP # ^^ Note: TAB indentation required