From 785ef7579f396b2d84ac4eae3b797f4dd2bea333 Mon Sep 17 00:00:00 2001 From: Janne Antikainen Date: Fri, 7 Nov 2025 08:59:39 +0200 Subject: [PATCH 1/4] New kuopio url --- nginx.conf | 2 +- test.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nginx.conf b/nginx.conf index 0301b7d..2d7049d 100644 --- a/nginx.conf +++ b/nginx.conf @@ -192,7 +192,7 @@ http { dev-joensuu.digitransit.fi joensuu.digitransit.fi dev-jyvaskyla.digitransit.fi jyvaskyla.digitransit.fi dev-kotka.digitransit.fi kotka.digitransit.fi - dev-kuopio.digitransit.fi kuopio.digitransit.fi + dev-kuopio.digitransit.fi kuopio.digitransit.fi reittiopas.kuopio.fi dev-lahti.digitransit.fi lahti.digitransit.fi dev-lappeenranta.digitransit.fi lappeenranta.digitransit.fi dev-mikkeli.digitransit.fi mikkeli.digitransit.fi diff --git a/test.js b/test.js index 629c833..6d0fa0b 100644 --- a/test.js +++ b/test.js @@ -249,7 +249,7 @@ describe('fintraffic ui', function() { describe('waltti ui', function() { const walttiCities = [ - 'hameenlinna', 'joensuu', 'jyvaskyla', 'kotka', 'kuopio', 'lahti', 'lappeenranta', + 'hameenlinna', 'joensuu', 'jyvaskyla', 'kotka', 'lahti', 'lappeenranta', 'mikkeli', 'turku', 'tampere','kouvola', 'rovaniemi','vaasa' ]; @@ -289,6 +289,9 @@ describe('waltti ui', function() { testRedirect('bosse.digitransit.fi','/kissa','https://bosse.digitransit.fi/kissa'); testProxying('bosse.digitransit.fi','/','digitransit-ui-waltti-v3:8080', true); + testRedirect('kuopio.digitransit.fi','/kissa','https://reittiopas.kuopio.fi/kissa'); + testProxying('reittiopas.kuopio.fi','/','digitransit-ui-waltti-v3:8080', true); + it('https should not redirect', function(done) { httpsGet('turku.digitransit.fi','/kissa').end((err,res)=>{ expect(err).to.be.null; From a3a7a340105ba9e79f07862908ad2a0963110d6e Mon Sep 17 00:00:00 2001 From: Janne Antikainen Date: Fri, 7 Nov 2025 09:08:30 +0200 Subject: [PATCH 2/4] redirect from kuopio digitransit.fi -> reittiopas.kuopio --- nginx.conf | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index 2d7049d..2062ed0 100644 --- a/nginx.conf +++ b/nginx.conf @@ -192,7 +192,7 @@ http { dev-joensuu.digitransit.fi joensuu.digitransit.fi dev-jyvaskyla.digitransit.fi jyvaskyla.digitransit.fi dev-kotka.digitransit.fi kotka.digitransit.fi - dev-kuopio.digitransit.fi kuopio.digitransit.fi reittiopas.kuopio.fi + dev-kuopio.digitransit.fi reittiopas.kuopio.fi dev-lahti.digitransit.fi lahti.digitransit.fi dev-lappeenranta.digitransit.fi lappeenranta.digitransit.fi dev-mikkeli.digitransit.fi mikkeli.digitransit.fi @@ -404,6 +404,40 @@ http { } } + server { + server_name kuopio.digitransit.fi; + listen 8080; + + # Prevent search engines from indexing the site + add_header X-Robots-Tag "noindex, nofollow, nosnippet, noarchive"; + + location = /sw.js { + proxy_pass https://serviceworker.blob.core.windows.net/serviceworker/destroy-sw.js; + proxy_set_header Host serviceworker.blob.core.windows.net; + proxy_cache common; + proxy_cache_valid 200 5m; + proxy_cache_lock on; + 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 = /appcache/manifest.appcache { + proxy_pass https://serviceworker.blob.core.windows.net/appcache/destroy-manifest.appcache; + default_type text/cache-manifest; + proxy_set_header Host serviceworker.blob.core.windows.net; + proxy_cache common; + proxy_cache_valid 200 5m; + proxy_cache_lock on; + 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 / { + return 301 https://reittiopas.kuopio.fi$request_uri; + } + } + server { server_name digitransit.fi www.digitransit.fi dev.digitransit.fi; listen 8080; From 50861a39252aca17c43f2f5c4072763d9c30f3bf Mon Sep 17 00:00:00 2001 From: Janne Antikainen Date: Fri, 7 Nov 2025 12:15:55 +0200 Subject: [PATCH 3/4] revert redirect --- nginx.conf | 2 +- test.js | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/nginx.conf b/nginx.conf index 2062ed0..ab26fd7 100644 --- a/nginx.conf +++ b/nginx.conf @@ -192,7 +192,7 @@ http { dev-joensuu.digitransit.fi joensuu.digitransit.fi dev-jyvaskyla.digitransit.fi jyvaskyla.digitransit.fi dev-kotka.digitransit.fi kotka.digitransit.fi - dev-kuopio.digitransit.fi reittiopas.kuopio.fi + dev-kuopio.digitransit.fi kuopio.digitransit.fi reittiopas.kuopio.fi dev-lahti.digitransit.fi lahti.digitransit.fi dev-lappeenranta.digitransit.fi lappeenranta.digitransit.fi dev-mikkeli.digitransit.fi mikkeli.digitransit.fi diff --git a/test.js b/test.js index 6d0fa0b..629c833 100644 --- a/test.js +++ b/test.js @@ -249,7 +249,7 @@ describe('fintraffic ui', function() { describe('waltti ui', function() { const walttiCities = [ - 'hameenlinna', 'joensuu', 'jyvaskyla', 'kotka', 'lahti', 'lappeenranta', + 'hameenlinna', 'joensuu', 'jyvaskyla', 'kotka', 'kuopio', 'lahti', 'lappeenranta', 'mikkeli', 'turku', 'tampere','kouvola', 'rovaniemi','vaasa' ]; @@ -289,9 +289,6 @@ describe('waltti ui', function() { testRedirect('bosse.digitransit.fi','/kissa','https://bosse.digitransit.fi/kissa'); testProxying('bosse.digitransit.fi','/','digitransit-ui-waltti-v3:8080', true); - testRedirect('kuopio.digitransit.fi','/kissa','https://reittiopas.kuopio.fi/kissa'); - testProxying('reittiopas.kuopio.fi','/','digitransit-ui-waltti-v3:8080', true); - it('https should not redirect', function(done) { httpsGet('turku.digitransit.fi','/kissa').end((err,res)=>{ expect(err).to.be.null; From 0bae24f1bedc28569d6325f8bc90130e4d00b867 Mon Sep 17 00:00:00 2001 From: Janne Antikainen Date: Fri, 7 Nov 2025 12:19:41 +0200 Subject: [PATCH 4/4] remove redirect, add test --- nginx.conf | 34 ---------------------------------- test.js | 2 ++ 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/nginx.conf b/nginx.conf index ab26fd7..2d7049d 100644 --- a/nginx.conf +++ b/nginx.conf @@ -404,40 +404,6 @@ http { } } - server { - server_name kuopio.digitransit.fi; - listen 8080; - - # Prevent search engines from indexing the site - add_header X-Robots-Tag "noindex, nofollow, nosnippet, noarchive"; - - location = /sw.js { - proxy_pass https://serviceworker.blob.core.windows.net/serviceworker/destroy-sw.js; - proxy_set_header Host serviceworker.blob.core.windows.net; - proxy_cache common; - proxy_cache_valid 200 5m; - proxy_cache_lock on; - 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 = /appcache/manifest.appcache { - proxy_pass https://serviceworker.blob.core.windows.net/appcache/destroy-manifest.appcache; - default_type text/cache-manifest; - proxy_set_header Host serviceworker.blob.core.windows.net; - proxy_cache common; - proxy_cache_valid 200 5m; - proxy_cache_lock on; - 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 / { - return 301 https://reittiopas.kuopio.fi$request_uri; - } - } - server { server_name digitransit.fi www.digitransit.fi dev.digitransit.fi; listen 8080; diff --git a/test.js b/test.js index 629c833..2dda2d3 100644 --- a/test.js +++ b/test.js @@ -289,6 +289,8 @@ describe('waltti ui', function() { testRedirect('bosse.digitransit.fi','/kissa','https://bosse.digitransit.fi/kissa'); testProxying('bosse.digitransit.fi','/','digitransit-ui-waltti-v3:8080', true); + testRedirect('reittiopas.kuopio.fi','/kissa','https://reittiopas.kuopio.fi/kissa'); + testProxying('reittiopas.kuopio.fi','/','digitransit-ui-waltti-v3:8080', true); it('https should not redirect', function(done) { httpsGet('turku.digitransit.fi','/kissa').end((err,res)=>{ expect(err).to.be.null;