From 4b71299f7de6a9389490be4f192320d4294d3285 Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Fri, 5 May 2023 09:39:51 +0300 Subject: [PATCH 1/4] Redicect waltti and finland v2 ui to v3 ui --- nginx.conf | 77 +++--------------------------------------------------- 1 file changed, 3 insertions(+), 74 deletions(-) diff --git a/nginx.conf b/nginx.conf index d9d4038..ca0055b 100644 --- a/nginx.conf +++ b/nginx.conf @@ -116,45 +116,6 @@ 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 dev-kelareitit.digitransit.fi kelareitit.digitransit.fi; @@ -196,10 +157,10 @@ http { } server { - server_name beta.matka.fi; + server_name beta.matka.fi dev.digitransit.fi; listen 8080; - return 301 https://dev.digitransit.fi; + return 301 https://next-dev-matka.digitransit.fi; } server { @@ -220,39 +181,7 @@ http { 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; - } + return 301 $scheme://next-$host$request_uri; } server { From c13f129a5cf6b537d6da2bb1b71fab25668f2e61 Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Fri, 5 May 2023 11:18:37 +0300 Subject: [PATCH 2/4] Update tests --- test.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/test.js b/test.js index 2c90ac1..2e996fb 100644 --- a/test.js +++ b/test.js @@ -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'); @@ -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'); From c210250ad1ff0edb007b5b714479463caf27d3ce Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Fri, 5 May 2023 11:33:35 +0300 Subject: [PATCH 3/4] Serve dev-city.digitransit domains using v3 ui server --- nginx.conf | 56 ++++++++++++++++++------------------------------------ 1 file changed, 18 insertions(+), 38 deletions(-) diff --git a/nginx.conf b/nginx.conf index ca0055b..e0c290a 100644 --- a/nginx.conf +++ b/nginx.conf @@ -117,7 +117,7 @@ http { } 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; @@ -157,50 +157,30 @@ http { } server { - server_name beta.matka.fi dev.digitransit.fi; + server_name beta.matka.fi listen 8080; 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; - - return 301 $scheme://next-$host$request_uri; - } 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; From e2f75aaa7d4f00bcca0cb6f96c517bab86386bad Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Fri, 5 May 2023 11:37:00 +0300 Subject: [PATCH 4/4] Add semicolon --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index e0c290a..3fe9923 100644 --- a/nginx.conf +++ b/nginx.conf @@ -157,7 +157,7 @@ http { } server { - server_name beta.matka.fi + server_name beta.matka.fi; listen 8080; return 301 https://next-dev-matka.digitransit.fi;