Skip to content

Commit

Permalink
Merge pull request #232 from HSLdevcom/redir-ui-paths
Browse files Browse the repository at this point in the history 
Redirect UI paths of removed services
  • Loading branch information
@optionsome
optionsome committed May 5, 2023
2 parents 4894fe4 + e2f75aa commit 1671771
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 117 deletions.
127 changes: 18 additions & 109 deletions nginx.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,46 +117,7 @@ http {
}

server {
server_name dev.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-v2: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 {
proxy_hide_header X-Frame-Options;
proxy_pass http://digitransit-ui-matka-v2:8080;
include basicsettings.conf;
}
location / {
proxy_pass http://digitransit-ui-matka-v2:8080;
include basicsettings.conf;
}
}

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

Expand Down Expand Up @@ -199,79 +160,27 @@ http {
server_name beta.matka.fi;
listen 8080;

return 301 https://dev.digitransit.fi;
return 301 https://next-dev-matka.digitransit.fi;
}

server {
server_name dev-hameenlinna.digitransit.fi
dev-joensuu.digitransit.fi
dev-jyvaskyla.digitransit.fi
dev-kotka.digitransit.fi
dev-kuopio.digitransit.fi
dev-lahti.digitransit.fi
dev-lappeenranta.digitransit.fi
dev-mikkeli.digitransit.fi
dev-oulu.digitransit.fi
dev-turku.digitransit.fi
dev-tampere.digitransit.fi
dev-kouvola.digitransit.fi
dev-rovaniemi.digitransit.fi
dev-vaasa.digitransit.fi
dev-pori.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-waltti-v2: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 {
proxy_hide_header X-Frame-Options;
proxy_pass http://digitransit-ui-waltti-v2:8080;
include basicsettings.conf;
}
location / {
proxy_pass http://digitransit-ui-waltti-v2:8080;
include basicsettings.conf;
}
}

server {
server_name next-dev-hameenlinna.digitransit.fi hameenlinna.digitransit.fi reittiopas.hameenlinna.fi
next-dev-joensuu.digitransit.fi joensuu.digitransit.fi
next-dev-jyvaskyla.digitransit.fi jyvaskyla.digitransit.fi
next-dev-kotka.digitransit.fi kotka.digitransit.fi
next-dev-kuopio.digitransit.fi kuopio.digitransit.fi
next-dev-lahti.digitransit.fi lahti.digitransit.fi
next-dev-lappeenranta.digitransit.fi lappeenranta.digitransit.fi
next-dev-mikkeli.digitransit.fi mikkeli.digitransit.fi
next-dev-oulu.digitransit.fi oulu.digitransit.fi
next-dev-turku.digitransit.fi turku.digitransit.fi reittiopas.foli.fi
next-dev-tampere.digitransit.fi tampere.digitransit.fi repa.tampere.fi reittiopas.tampere.fi
next-dev-kouvola.digitransit.fi kouvola.digitransit.fi
next-dev-rovaniemi.digitransit.fi rovaniemi.digitransit.fi
next-dev-opas.waltti.fi dev-opas.waltti.fi opas.waltti.fi
next-dev-vaasa.digitransit.fi vaasa.digitransit.fi
next-dev-pori.digitransit.fi pori.digitransit.fi
server_name dev-hameenlinna.digitransit.fi next-dev-hameenlinna.digitransit.fi hameenlinna.digitransit.fi reittiopas.hameenlinna.fi
dev-joensuu.digitransit.fi next-dev-joensuu.digitransit.fi joensuu.digitransit.fi
dev-jyvaskyla.digitransit.fi next-dev-jyvaskyla.digitransit.fi jyvaskyla.digitransit.fi
dev-kotka.digitransit.fi next-dev-kotka.digitransit.fi kotka.digitransit.fi
dev-kuopio.digitransit.fi next-dev-kuopio.digitransit.fi kuopio.digitransit.fi
dev-lahti.digitransit.fi next-dev-lahti.digitransit.fi lahti.digitransit.fi
dev-lappeenranta.digitransit.fi next-dev-lappeenranta.digitransit.fi lappeenranta.digitransit.fi
dev-mikkeli.digitransit.fi next-dev-mikkeli.digitransit.fi mikkeli.digitransit.fi
dev-oulu.digitransit.fi next-dev-oulu.digitransit.fi oulu.digitransit.fi
dev-turku.digitransit.fi next-dev-turku.digitransit.fi turku.digitransit.fi reittiopas.foli.fi
dev-tampere.digitransit.fi next-dev-tampere.digitransit.fi tampere.digitransit.fi repa.tampere.fi reittiopas.tampere.fi
dev-kouvola.digitransit.fi next-dev-kouvola.digitransit.fi kouvola.digitransit.fi
dev-rovaniemi.digitransit.fi next-dev-rovaniemi.digitransit.fi rovaniemi.digitransit.fi
dev-opas.waltti.fi next-dev-opas.waltti.fi dev-opas.waltti.fi opas.waltti.fi
dev-vaasa.digitransit.fi next-dev-vaasa.digitransit.fi vaasa.digitransit.fi
dev-pori.digitransit.fi next-dev-pori.digitransit.fi pori.digitransit.fi
dev-varely.digitransit.fi varely.digitransit.fi reittiopas.seutuplus.fi;
listen 8080;

Expand Down
13 changes: 5 additions & 8 deletions test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,9 @@ describe('api.digitransit.fi', function() {
testResponseHeader('dev-api.digitransit.fi','/routing-data/v3/waltti-alt/router-config.json', 'access-control-allow-origin', '*');
testProxying('dev-api.digitransit.fi','/routing-data/v3/finland/router-finland.zip','opentripplanner-data-con-finland-v3:8080');
testResponseHeader('dev-api.digitransit.fi','/routing-data/v3/finland/router-config.json', 'access-control-allow-origin', '*');
testProxying('api.digitransit.fi','/ui/v1/finland/sw.js','digitransit-ui-matka-v2:8080');
testProxying('api.digitransit.fi','/ui/v1/hsl-next/sw.js','digitransit-ui-hsl-v2:8080');
testProxying('api.digitransit.fi','/ui/v1/waltti-next/sw.js','digitransit-ui-waltti-v2:8080');
testProxying('api.digitransit.fi','/ui/v2/matka/sw.js','digitransit-ui-matka-v2:8080');
testProxying('api.digitransit.fi','/ui/v2/hsl/sw.js','digitransit-ui-hsl-v2:8080');
testProxying('api.digitransit.fi','/ui/v2/waltti/sw.js','digitransit-ui-waltti-v2:8080');
testProxying('api.digitransit.fi','/ui/v3/matka/sw.js','digitransit-ui-matka-v3:8080');
testProxying('api.digitransit.fi','/ui/v3/hsl/sw.js','digitransit-ui-hsl-v3:8080');
testProxying('api.digitransit.fi','/ui/v3/waltti/sw.js','digitransit-ui-waltti-v3:8080');
testProxying('api.digitransit.fi','/ui/v3/matka/sw.js','digitransit-ui-matka-v3:8080');
testProxying('api.digitransit.fi','/ui/v3/hsl/sw.js','digitransit-ui-hsl-v3:8080');
testProxying('api.digitransit.fi','/ui/v3/waltti/sw.js','digitransit-ui-waltti-v3:8080');
Expand Down Expand Up @@ -210,8 +207,8 @@ describe('waltti ui', function() {
];

walttiCities.forEach(function(city) {
testRedirect('dev-'+city+'.digitransit.fi','/kissa','https://dev-'+city+'.digitransit.fi/kissa');
testProxying('dev-'+city+'.digitransit.fi','/','digitransit-ui-waltti-v2:8080', true);
testRedirect('next-dev-'+city+'.digitransit.fi','/kissa','https://next-dev-'+city+'.digitransit.fi/kissa');
testProxying('next-dev-'+city+'.digitransit.fi','/','digitransit-ui-waltti-v3:8080', true);
testRedirect('next-dev-'+city+'.digitransit.fi','/kissa','https://next-dev-'+city+'.digitransit.fi/kissa');
testProxying('next-dev-'+city+'.digitransit.fi','/','digitransit-ui-waltti-v3:8080', true);
testRedirect(city+'.digitransit.fi','/kissa','https://'+city+'.digitransit.fi/kissa');
Expand Down

0 comments on commit 1671771

Please sign in to comment.