Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions common.conf
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,14 @@ location /ui/v3/hsl-test/ {
# proxy_set_header X-Forwarded-Host $host;
}

location /ui/v3/matka-test/ {
rewrite /ui/v3/matka-test/(.*) /$1 break;
proxy_pass http://digitransit-ui-matka-test:8080;
proxy_redirect off;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}

location /waltti-assets/v1/ {
rewrite /waltti-assets/v1/(.*)$ /tvv-lippu-ja-maksujarjestelma-oy/waltti-digitransit-config-data/main/$1 break;
proxy_pass https://raw.githubusercontent.com;
Expand Down
42 changes: 41 additions & 1 deletion nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ http {
}

server {
server_name dev-matka.digitransit.fi next-dev-matka.digitransit.fi opas.matka.fi matka.fintraffic.fi
server_name dev-matka.digitransit.fi opas.matka.fi matka.fintraffic.fi
dev-kelareitit.digitransit.fi kelareitit.digitransit.fi;
listen 8080;

Expand Down Expand Up @@ -187,6 +187,46 @@ http {
}
}

server {
server_name next-dev-matka.digitransit.fi;
listen 8080;

if ($http_x_forwarded_proto != "https") {
return 301 https://$host$request_uri;
}

# Add HTTP Strict Transport Security for good measure.
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains;";

error_page 500 502 503 504 /502.html;
location = /502.html {
proxy_pass https://errorpages.blob.core.windows.net/html/digitransit-error-page.html;
internal;
}

location = /sw.js {
proxy_pass http://digitransit-ui-matka-test:8080;
include basicsettings.conf;
proxy_cache sw;
proxy_cache_valid 200 30s;
proxy_cache_lock on;
proxy_cache_key "$host$request_uri";
add_header X-Proxy-Cache $upstream_cache_status;
proxy_ignore_headers X-Accel-Expires Expires Cache-Control Set-Cookie;
proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;
}
location = /haku {
add_header X-Robots-Tag "noindex, nofollow, nosnippet, noarchive";
proxy_hide_header X-Frame-Options;
proxy_pass http://digitransit-ui-matka-test:8080;
include basicsettings.conf;
}
location / {
proxy_pass http://digitransit-ui-matka-test:8080;
include basicsettings.conf;
}
}

server {
server_name dev-hameenlinna.digitransit.fi hameenlinna.digitransit.fi reittiopas.hameenlinna.fi
dev-joensuu.digitransit.fi joensuu.digitransit.fi
Expand Down