From 62eb0f77c56f54ddf9516f223d7cd3b35f8b82e5 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 28 May 2021 13:27:08 +0300 Subject: [PATCH 01/18] Add vaasa UI --- nginx.conf | 6 ++++-- test.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nginx.conf b/nginx.conf index 07ef639..404cbcf 100644 --- a/nginx.conf +++ b/nginx.conf @@ -189,7 +189,8 @@ http { dev-oulu.digitransit.fi oulu.digitransit.fi dev-kouvola.digitransit.fi kouvola.digitransit.fi dev-rovaniemi.digitransit.fi rovaniemi.digitransit.fi - dev-opas.waltti.fi opas.waltti.fi; + dev-opas.waltti.fi opas.waltti.fi + dev-vaasa.digitransit.fi vaasa.digitransit.fi; listen 8080; if ($http_x_forwarded_proto != "https") { @@ -272,7 +273,8 @@ http { next-dev-tampere.digitransit.fi dev-tampere.digitransit.fi tampere.digitransit.fi repa.tampere.fi reittiopas.tampere.fi next-dev-kouvola.digitransit.fi next-dev-rovaniemi.digitransit.fi - next-dev-opas.waltti.fi; + next-dev-opas.waltti.fi + next-dev-vaasa.digitransit.fi; listen 8080; if ($http_x_forwarded_proto != "https") { diff --git a/test.js b/test.js index 81081c4..512df21 100644 --- a/test.js +++ b/test.js @@ -202,7 +202,7 @@ describe('matka ui', function() { describe('waltti ui', function() { const legacyUICities = ['hameenlinna', 'joensuu', 'kotka', 'lahti', - 'lappeenranta', 'oulu', 'kouvola', 'rovaniemi']; + 'lappeenranta', 'oulu', 'kouvola', 'rovaniemi', 'vaasa']; const newUICities = ['jyvaskyla', 'kuopio', 'mikkeli', 'turku', 'tampere']; From c8b3a2e9bb916c70461e575d47bcf5364b67e2f8 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 28 May 2021 13:48:02 +0300 Subject: [PATCH 02/18] Always use new ui for vaasa --- nginx.conf | 5 ++--- test.js | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/nginx.conf b/nginx.conf index 404cbcf..735a6d3 100644 --- a/nginx.conf +++ b/nginx.conf @@ -189,8 +189,7 @@ http { dev-oulu.digitransit.fi oulu.digitransit.fi dev-kouvola.digitransit.fi kouvola.digitransit.fi dev-rovaniemi.digitransit.fi rovaniemi.digitransit.fi - dev-opas.waltti.fi opas.waltti.fi - dev-vaasa.digitransit.fi vaasa.digitransit.fi; + dev-opas.waltti.fi opas.waltti.fi; listen 8080; if ($http_x_forwarded_proto != "https") { @@ -274,7 +273,7 @@ http { next-dev-kouvola.digitransit.fi next-dev-rovaniemi.digitransit.fi next-dev-opas.waltti.fi - next-dev-vaasa.digitransit.fi; + next-dev-vaasa.digitransit.fi dev-vaasa.digitransit.fi vaasa.digitransit.fi; listen 8080; if ($http_x_forwarded_proto != "https") { diff --git a/test.js b/test.js index 512df21..cb4f653 100644 --- a/test.js +++ b/test.js @@ -202,9 +202,9 @@ describe('matka ui', function() { describe('waltti ui', function() { const legacyUICities = ['hameenlinna', 'joensuu', 'kotka', 'lahti', - 'lappeenranta', 'oulu', 'kouvola', 'rovaniemi', 'vaasa']; + 'lappeenranta', 'oulu', 'kouvola', 'rovaniemi']; - const newUICities = ['jyvaskyla', 'kuopio', 'mikkeli', 'turku', 'tampere']; + const newUICities = ['jyvaskyla', 'kuopio', 'mikkeli', 'turku', 'tampere', 'vaasa']; legacyUICities.forEach(function(city) { testRedirect('dev-'+city+'.digitransit.fi','/kissa','https://dev-'+city+'.digitransit.fi/kissa'); From 7627f0ad0ca64b81321dbbeb41cd04900148bbb9 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 31 May 2021 11:56:19 +0300 Subject: [PATCH 03/18] Don't use HSL error page for site --- nginx.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nginx.conf b/nginx.conf index 735a6d3..b67ffe4 100644 --- a/nginx.conf +++ b/nginx.conf @@ -392,12 +392,6 @@ http { # 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/error_page.html; - internal; - } - location / { proxy_pass http://digitransit-site:8080; proxy_redirect off; From 77c0251dcb8f9aef7d68c8c093ed3d680eaedb24 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 4 Jun 2021 12:59:52 +0300 Subject: [PATCH 04/18] Migrate to new ui Hameenlinna, Joensuu and Oulu --- nginx.conf | 11 ++++------- test.js | 7 +++---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/nginx.conf b/nginx.conf index b67ffe4..33d16a4 100644 --- a/nginx.conf +++ b/nginx.conf @@ -181,12 +181,9 @@ http { } server { - server_name dev-hameenlinna.digitransit.fi hameenlinna.digitransit.fi reittiopas.hameenlinna.fi - dev-joensuu.digitransit.fi joensuu.digitransit.fi - dev-kotka.digitransit.fi kotka.digitransit.fi + server_name dev-kotka.digitransit.fi kotka.digitransit.fi dev-lahti.digitransit.fi lahti.digitransit.fi dev-lappeenranta.digitransit.fi lappeenranta.digitransit.fi - dev-oulu.digitransit.fi oulu.digitransit.fi dev-kouvola.digitransit.fi kouvola.digitransit.fi dev-rovaniemi.digitransit.fi rovaniemi.digitransit.fi dev-opas.waltti.fi opas.waltti.fi; @@ -259,15 +256,15 @@ http { } server { - server_name next-dev-hameenlinna.digitransit.fi - next-dev-joensuu.digitransit.fi + server_name next-dev-hameenlinna.digitransit.fi dev-hameenlinna.digitransit.fi hameenlinna.digitransit.fi reittiopas.hameenlinna.fi + next-dev-joensuu.digitransit.fi dev-joensuu.digitransit.fi joensuu.digitransit.fi next-dev-jyvaskyla.digitransit.fi dev-jyvaskyla.digitransit.fi jyvaskyla.digitransit.fi next-dev-kotka.digitransit.fi next-dev-kuopio.digitransit.fi dev-kuopio.digitransit.fi kuopio.digitransit.fi next-dev-lahti.digitransit.fi next-dev-lappeenranta.digitransit.fi next-dev-mikkeli.digitransit.fi dev-mikkeli.digitransit.fi mikkeli.digitransit.fi - next-dev-oulu.digitransit.fi + next-dev-oulu.digitransit.fi dev-oulu.digitransit.fi oulu.digitransit.fi next-dev-turku.digitransit.fi dev-turku.digitransit.fi turku.digitransit.fi reittiopas.foli.fi next-dev-tampere.digitransit.fi dev-tampere.digitransit.fi tampere.digitransit.fi repa.tampere.fi reittiopas.tampere.fi next-dev-kouvola.digitransit.fi diff --git a/test.js b/test.js index cb4f653..2767ffd 100644 --- a/test.js +++ b/test.js @@ -201,10 +201,9 @@ describe('matka ui', function() { }); describe('waltti ui', function() { - const legacyUICities = ['hameenlinna', 'joensuu', 'kotka', 'lahti', - 'lappeenranta', 'oulu', 'kouvola', 'rovaniemi']; + const legacyUICities = ['kotka', 'lahti', 'lappeenranta', 'kouvola', 'rovaniemi']; - const newUICities = ['jyvaskyla', 'kuopio', 'mikkeli', 'turku', 'tampere', 'vaasa']; + const newUICities = ['jyvaskyla', 'kuopio', 'mikkeli', 'turku', 'tampere', 'vaasa', 'hameenlinna', 'joensuu', 'oulu']; legacyUICities.forEach(function(city) { testRedirect('dev-'+city+'.digitransit.fi','/kissa','https://dev-'+city+'.digitransit.fi/kissa'); @@ -228,7 +227,7 @@ describe('waltti ui', function() { testProxying('reittiopas.foli.fi','/','digitransit-ui-waltti-next:8080', true); testRedirect('reittiopas.hameenlinna.fi','/kissa','https://reittiopas.hameenlinna.fi/kissa'); - testProxying('reittiopas.hameenlinna.fi','/','digitransit-ui-waltti:8080', true); + testProxying('reittiopas.hameenlinna.fi','/','digitransit-ui-waltti-next:8080', true); testRedirect('repa.tampere.fi','/kissa','https://repa.tampere.fi/kissa'); testProxying('repa.tampere.fi','/','digitransit-ui-waltti-next:8080', true); From 6fcdd32f24359f3a61ac4566b31633700165cbcd Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 7 Jun 2021 09:29:12 +0300 Subject: [PATCH 05/18] Update list of cities that get ui update --- nginx.conf | 17 +++++++---------- test.js | 7 +++++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nginx.conf b/nginx.conf index 33d16a4..49ce589 100644 --- a/nginx.conf +++ b/nginx.conf @@ -181,11 +181,8 @@ http { } server { - server_name dev-kotka.digitransit.fi kotka.digitransit.fi - dev-lahti.digitransit.fi lahti.digitransit.fi - dev-lappeenranta.digitransit.fi lappeenranta.digitransit.fi - dev-kouvola.digitransit.fi kouvola.digitransit.fi - dev-rovaniemi.digitransit.fi rovaniemi.digitransit.fi + server_name dev-rovaniemi.digitransit.fi rovaniemi.digitransit.fi + dev-oulu.digitransit.fi oulu.digitransit.fi dev-opas.waltti.fi opas.waltti.fi; listen 8080; @@ -259,15 +256,15 @@ http { server_name next-dev-hameenlinna.digitransit.fi dev-hameenlinna.digitransit.fi hameenlinna.digitransit.fi reittiopas.hameenlinna.fi next-dev-joensuu.digitransit.fi dev-joensuu.digitransit.fi joensuu.digitransit.fi next-dev-jyvaskyla.digitransit.fi dev-jyvaskyla.digitransit.fi jyvaskyla.digitransit.fi - next-dev-kotka.digitransit.fi + next-dev-kotka.digitransit.fi dev-kotka.digitransit.fi kotka.digitransit.fi next-dev-kuopio.digitransit.fi dev-kuopio.digitransit.fi kuopio.digitransit.fi - next-dev-lahti.digitransit.fi - next-dev-lappeenranta.digitransit.fi + next-dev-lahti.digitransit.fi dev-lahti.digitransit.fi lahti.digitransit.fi + next-dev-lappeenranta.digitransit.fi dev-lappeenranta.digitransit.fi lappeenranta.digitransit.fi next-dev-mikkeli.digitransit.fi dev-mikkeli.digitransit.fi mikkeli.digitransit.fi - next-dev-oulu.digitransit.fi dev-oulu.digitransit.fi oulu.digitransit.fi + next-dev-oulu.digitransit.fi next-dev-turku.digitransit.fi dev-turku.digitransit.fi turku.digitransit.fi reittiopas.foli.fi next-dev-tampere.digitransit.fi dev-tampere.digitransit.fi tampere.digitransit.fi repa.tampere.fi reittiopas.tampere.fi - next-dev-kouvola.digitransit.fi + next-dev-kouvola.digitransit.fi dev-kouvola.digitransit.fi kouvola.digitransit.fi next-dev-rovaniemi.digitransit.fi next-dev-opas.waltti.fi next-dev-vaasa.digitransit.fi dev-vaasa.digitransit.fi vaasa.digitransit.fi; diff --git a/test.js b/test.js index 2767ffd..d26117c 100644 --- a/test.js +++ b/test.js @@ -201,9 +201,12 @@ describe('matka ui', function() { }); describe('waltti ui', function() { - const legacyUICities = ['kotka', 'lahti', 'lappeenranta', 'kouvola', 'rovaniemi']; + const legacyUICities = ['oulu', 'rovaniemi']; - const newUICities = ['jyvaskyla', 'kuopio', 'mikkeli', 'turku', 'tampere', 'vaasa', 'hameenlinna', 'joensuu', 'oulu']; + const newUICities = [ + 'jyvaskyla', 'kuopio', 'mikkeli', 'turku', 'tampere', 'vaasa', 'hameenlinna', + 'joensuu', 'kotka', 'lahti', 'lappeenranta', 'kouvola' + ]; legacyUICities.forEach(function(city) { testRedirect('dev-'+city+'.digitransit.fi','/kissa','https://dev-'+city+'.digitransit.fi/kissa'); From be016d424896172d7e73ce888311d5d3c8a74b1b Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 8 Jun 2021 09:52:21 +0300 Subject: [PATCH 06/18] Add salo realtime external endpoint --- external.conf | 13 +++++++++++++ run.sh | 1 + test.sh | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/external.conf b/external.conf index a791495..61e6430 100644 --- a/external.conf +++ b/external.conf @@ -319,3 +319,16 @@ location /out/lifti.mattersoft.fi/ { proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504; proxy_set_header Authorization VAASA_BASIC_AUTH; } + +#salo gtfs rt (https://paikku.mattersoft.fi/api/gtfsrealtime/v1.0/feed/tripupdate, servicealert and vehicleposition) +location /out/paikku.mattersoft.fi/ { + proxy_pass https://paikku.mattersoft.fi/; + include allowed-ips.conf; + proxy_cache ext_cache; + proxy_cache_valid 200 30s; + 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; + proxy_set_header Authorization SALO_BASIC_AUTH; +} diff --git a/run.sh b/run.sh index 409d454..6f1357d 100755 --- a/run.sh +++ b/run.sh @@ -29,6 +29,7 @@ sed -i "s/dev.hslfi.hsldev.com/${NEW_HSL_FI_URL}/" /etc/nginx/nginx.conf sed -i "s/LMJ_BASIC_AUTH/${LMJ_BASIC_AUTH}/" /etc/nginx/external.conf sed -i "s/MIKKELI_BASIC_AUTH/${MIKKELI_BASIC_AUTH}/" /etc/nginx/external.conf sed -i "s/VAASA_BASIC_AUTH/${VAASA_BASIC_AUTH}/" /etc/nginx/external.conf +sed -i "s/SALO_BASIC_AUTH/${SALO_BASIC_AUTH}/" /etc/nginx/external.conf #start nginx nginx diff --git a/test.sh b/test.sh index 46755ee..653822e 100755 --- a/test.sh +++ b/test.sh @@ -25,7 +25,7 @@ CONTAINER_ID=`docker run -d -p 9000:8080 $ADDHOSTS -e VILKKU_BASIC_AUTH="\"test\ -e MATKAHUOLTO_VANTAA_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_VARSINAIS_BASIC_AUTH="\"test\"" \ -e HAMEENLINNA_BASIC_AUTH="\"test\"" -e NEW_HSL_FI_URL=uusi.hsl.fi \ -e LMJ_BASIC_AUTH="\"test\"" -e MIKKELI_BASIC_AUTH="\"test\"" \ - -e VAASA_BASIC_AUTH="\"test\"" hsldevcom/digitransit-proxy:integrationtest` + -e VAASA_BASIC_AUTH="\"test\"" -e SALO_BASIC_AUTH="\"test\"" hsldevcom/digitransit-proxy:integrationtest` curl -v http://127.0.0.1:9000 From aa9b0746df1de44d65fb663243a8b1cd03517f37 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 8 Jun 2021 10:47:24 +0300 Subject: [PATCH 07/18] Increase sleep before tests --- test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.sh b/test.sh index 653822e..af9b1b0 100755 --- a/test.sh +++ b/test.sh @@ -35,7 +35,7 @@ echo starting echo server... node test_server.js & PID=$! -sleep 5 +sleep 10 mocha STATUS=$? From 25c7f40d1aca75269cc181c9168e5dfb498e3049 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 11 Jun 2021 09:57:44 +0300 Subject: [PATCH 08/18] Change beta.matka.fi redirect to dev.digitransit.fi --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index 49ce589..548d58c 100644 --- a/nginx.conf +++ b/nginx.conf @@ -177,7 +177,7 @@ http { server_name beta.matka.fi; listen 8080; - return 301 https://www.liikennevirasto.fi/uutinen/-/asset_publisher/SHHdKcU2jahL/content/matka-fi-osoite-muuttuu; + return 301 https://dev.digitransit.fi; } server { From 67cda1881545b07ba78e907acb75d9edbee7b557 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 21 Jun 2021 10:06:32 +0300 Subject: [PATCH 09/18] Use new ui for waltti opas and oulu --- nginx.conf | 8 +++----- test.js | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/nginx.conf b/nginx.conf index 548d58c..ef0f184 100644 --- a/nginx.conf +++ b/nginx.conf @@ -181,9 +181,7 @@ http { } server { - server_name dev-rovaniemi.digitransit.fi rovaniemi.digitransit.fi - dev-oulu.digitransit.fi oulu.digitransit.fi - dev-opas.waltti.fi opas.waltti.fi; + server_name dev-rovaniemi.digitransit.fi rovaniemi.digitransit.fi; listen 8080; if ($http_x_forwarded_proto != "https") { @@ -261,12 +259,12 @@ http { next-dev-lahti.digitransit.fi dev-lahti.digitransit.fi lahti.digitransit.fi next-dev-lappeenranta.digitransit.fi dev-lappeenranta.digitransit.fi lappeenranta.digitransit.fi next-dev-mikkeli.digitransit.fi dev-mikkeli.digitransit.fi mikkeli.digitransit.fi - next-dev-oulu.digitransit.fi + next-dev-oulu.digitransit.fi dev-oulu.digitransit.fi oulu.digitransit.fi next-dev-turku.digitransit.fi dev-turku.digitransit.fi turku.digitransit.fi reittiopas.foli.fi next-dev-tampere.digitransit.fi dev-tampere.digitransit.fi tampere.digitransit.fi repa.tampere.fi reittiopas.tampere.fi next-dev-kouvola.digitransit.fi dev-kouvola.digitransit.fi kouvola.digitransit.fi next-dev-rovaniemi.digitransit.fi - next-dev-opas.waltti.fi + next-dev-opas.waltti.fi dev-opas.waltti.fi opas.waltti.fi next-dev-vaasa.digitransit.fi dev-vaasa.digitransit.fi vaasa.digitransit.fi; listen 8080; diff --git a/test.js b/test.js index d26117c..e2f9595 100644 --- a/test.js +++ b/test.js @@ -201,11 +201,11 @@ describe('matka ui', function() { }); describe('waltti ui', function() { - const legacyUICities = ['oulu', 'rovaniemi']; + const legacyUICities = ['rovaniemi']; const newUICities = [ 'jyvaskyla', 'kuopio', 'mikkeli', 'turku', 'tampere', 'vaasa', 'hameenlinna', - 'joensuu', 'kotka', 'lahti', 'lappeenranta', 'kouvola' + 'joensuu', 'kotka', 'lahti', 'lappeenranta', 'kouvola','oulu' ]; legacyUICities.forEach(function(city) { @@ -240,7 +240,7 @@ describe('waltti ui', function() { testCaching('reittiopas.tampere.fi','/sw.js', true); testRedirect('opas.waltti.fi','/kissa','https://opas.waltti.fi/kissa'); - testProxying('opas.waltti.fi','/','digitransit-ui-waltti:8080', true); + testProxying('opas.waltti.fi','/','digitransit-ui-waltti-next:8080', true); testRedirect('next-dev-opas.waltti.fi','/kissa','https://next-dev-opas.waltti.fi/kissa'); testProxying('next-dev-opas.waltti.fi','/','digitransit-ui-waltti-next:8080', true); From fcafd9abc99f55e1d3b47fa7b39a0b42e2b721a8 Mon Sep 17 00:00:00 2001 From: Aleksi Siitari Date: Wed, 11 Aug 2021 10:16:03 +0300 Subject: [PATCH 10/18] add new location matka-fonts --- common.conf | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/common.conf b/common.conf index a7a002c..2913987 100644 --- a/common.conf +++ b/common.conf @@ -404,3 +404,14 @@ location /fonts/ { add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; } + +location /matka-fonts/ { + rewrite /matka-fonts/(.*) /$1 break; + proxy_pass https://matkafonts.blob.core.windows.net; + proxy_redirect off; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + # proxy_set_header X-Forwarded-Host $host; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; +} From 6e89db2aa876d1e12a29068697ef95effde7af73 Mon Sep 17 00:00:00 2001 From: Aleksi Siitari Date: Wed, 11 Aug 2021 12:53:03 +0300 Subject: [PATCH 11/18] fix: matka font cors policy --- common.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common.conf b/common.conf index 2913987..a365f92 100644 --- a/common.conf +++ b/common.conf @@ -412,6 +412,5 @@ location /matka-fonts/ { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; # proxy_set_header X-Forwarded-Host $host; - add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; - add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; + include cors.conf; } From d9efbf2a7b6c3cbbfa33ebd15f881cfa9a57b295 Mon Sep 17 00:00:00 2001 From: Aleksi Siitari Date: Thu, 12 Aug 2021 15:04:55 +0300 Subject: [PATCH 12/18] feat: add error pages to waltti and matka uis --- nginx.conf | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nginx.conf b/nginx.conf index ef0f184..3264fdc 100644 --- a/nginx.conf +++ b/nginx.conf @@ -149,6 +149,12 @@ http { # 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-default:8080; proxy_redirect off; @@ -275,6 +281,12 @@ http { # 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-next:8080; proxy_redirect off; From 8d186f037d43d92b67ade1151101298fe636bf53 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 17 Aug 2021 11:59:45 +0300 Subject: [PATCH 13/18] Remove linjasto2021 APIs and redirect to normal journey planner --- common.conf | 43 ------------------------------------------- nginx.conf | 28 +--------------------------- test.js | 3 +-- 3 files changed, 2 insertions(+), 72 deletions(-) diff --git a/common.conf b/common.conf index a365f92..68d5334 100644 --- a/common.conf +++ b/common.conf @@ -146,20 +146,6 @@ location /map/v1/next- { # add_header X-Cache-Status $upstream_cache_status; } -location /map/v1/linjasto2021- { - rewrite /map/v1/linjasto2021-(.*) /map/v1/$1 break; - proxy_pass http://hsl-map-server-linjasto2021:8080; - # proxy_cache tiles; - # proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504; - # proxy_cache_revalidate on; - # proxy_cache_lock on; - proxy_redirect off; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # proxy_set_header X-Forwarded-Host $host; - # add_header X-Cache-Status $upstream_cache_status; -} - location /map/v1/ { proxy_pass http://hsl-map-server:8080; proxy_cache tiles; @@ -251,16 +237,6 @@ location /routing/v1/routers/next-waltti { proxy_read_timeout 11500ms; } -location /routing/v1/routers/linjasto2021-waltti { - rewrite /routing/v1/routers/linjasto2021-waltti(.*) /otp/routers/default$1 break; - proxy_pass http://opentripplanner-linjasto2021-waltti:8080/; - proxy_redirect off; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # proxy_set_header X-Forwarded-Host $host; - proxy_read_timeout 11500ms; -} - location /routing-data/v2/hsl { rewrite /routing-data/v2/hsl/(.*) /$1 break; proxy_pass http://opentripplanner-data-con-hsl:8080/; @@ -311,16 +287,6 @@ location /routing-data/v2/next-waltti { include cors.conf; } -location /routing-data/v2/linjasto2021-waltti { - rewrite /routing-data/v2/linjasto2021-waltti/(.*) /$1 break; - proxy_pass http://opentripplanner-data-con-linjasto2021-waltti:8080/; - proxy_redirect off; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # proxy_set_header X-Forwarded-Host $host; - include cors.conf; -} - location /routing-data/v2/next-finland { rewrite /routing-data/v2/next-finland/(.*) /$1 break; proxy_pass http://opentripplanner-data-con-finland:8080/; @@ -376,15 +342,6 @@ location /ui/v1/waltti-next/ { # proxy_set_header X-Forwarded-Host $host; } -location /ui/v1/linjasto2021/ { - rewrite /ui/v1/linjasto2021/(.*) /$1 break; - proxy_pass http://digitransit-ui-linjasto2021:8080; - proxy_redirect off; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # proxy_set_header X-Forwarded-Host $host; -} - location /timetables/v1/hsl/ { rewrite /timetables/v1/hsl/(.*) /hsl/$1 break; proxy_pass http://hsl-timetable-container:8080; diff --git a/nginx.conf b/nginx.conf index 3264fdc..3b92995 100644 --- a/nginx.conf +++ b/nginx.conf @@ -225,34 +225,8 @@ http { server_name dev-linjasto2021.digitransit.fi linjasto2021.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;"; - - location = /sw.js { - proxy_pass http://digitransit-ui-linjasto2021:8080; - proxy_redirect off; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $host; - 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 / { - proxy_pass http://digitransit-ui-linjasto2021:8080; - proxy_redirect off; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $host; + return 301 https://reittiopas.tampere.fi; } } diff --git a/test.js b/test.js index e2f9595..ff30689 100644 --- a/test.js +++ b/test.js @@ -254,8 +254,7 @@ describe('waltti ui', function() { }); describe('linjasto2021 ui', function() { - testRedirect('linjasto2021.digitransit.fi','/kissa','https://linjasto2021.digitransit.fi/kissa'); - testProxying('linjasto2021.digitransit.fi','/','digitransit-ui-linjasto2021:8080', true); + testRedirect('linjasto2021.digitransit.fi','/kissa','https://reittiopas.tampere.fi'); }); describe('sentry-analytics', function() { From 04ac919c87b32494db0f898c103b95aa35d3134b Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 19 Aug 2021 12:42:56 +0300 Subject: [PATCH 14/18] Add kouvola external realtime endpoint --- external.conf | 13 +++++++++++++ run.sh | 1 + test.sh | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/external.conf b/external.conf index 61e6430..672377a 100644 --- a/external.conf +++ b/external.conf @@ -332,3 +332,16 @@ location /out/paikku.mattersoft.fi/ { proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504; proxy_set_header Authorization SALO_BASIC_AUTH; } + +#kouvola gtfs rt (https://koutsi.mattersoft.fi/api/gtfsrealtime/v1.0/feed/tripupdate, servicealert and vehicleposition) +location /out/koutsi.mattersoft.fi/ { + proxy_pass https://koutsi.mattersoft.fi/; + include allowed-ips.conf; + proxy_cache ext_cache; + proxy_cache_valid 200 30s; + 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; + proxy_set_header Authorization KOUVOLA_BASIC_AUTH; +} diff --git a/run.sh b/run.sh index 6f1357d..cc304fd 100755 --- a/run.sh +++ b/run.sh @@ -30,6 +30,7 @@ sed -i "s/LMJ_BASIC_AUTH/${LMJ_BASIC_AUTH}/" /etc/nginx/external.conf sed -i "s/MIKKELI_BASIC_AUTH/${MIKKELI_BASIC_AUTH}/" /etc/nginx/external.conf sed -i "s/VAASA_BASIC_AUTH/${VAASA_BASIC_AUTH}/" /etc/nginx/external.conf sed -i "s/SALO_BASIC_AUTH/${SALO_BASIC_AUTH}/" /etc/nginx/external.conf +sed -i "s/KOUVOLA_BASIC_AUTH/${KOUVOLA_BASIC_AUTH}/" /etc/nginx/external.conf #start nginx nginx diff --git a/test.sh b/test.sh index af9b1b0..86e3c14 100755 --- a/test.sh +++ b/test.sh @@ -25,7 +25,8 @@ CONTAINER_ID=`docker run -d -p 9000:8080 $ADDHOSTS -e VILKKU_BASIC_AUTH="\"test\ -e MATKAHUOLTO_VANTAA_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_VARSINAIS_BASIC_AUTH="\"test\"" \ -e HAMEENLINNA_BASIC_AUTH="\"test\"" -e NEW_HSL_FI_URL=uusi.hsl.fi \ -e LMJ_BASIC_AUTH="\"test\"" -e MIKKELI_BASIC_AUTH="\"test\"" \ - -e VAASA_BASIC_AUTH="\"test\"" -e SALO_BASIC_AUTH="\"test\"" hsldevcom/digitransit-proxy:integrationtest` + -e VAASA_BASIC_AUTH="\"test\"" -e SALO_BASIC_AUTH="\"test\"" \ + -e KOUVOLA_BASIC_AUTH="\"test\"" hsldevcom/digitransit-proxy:integrationtest` curl -v http://127.0.0.1:9000 From 23e62b3ec3bcfa09cd1c778c255909adf0e090e3 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 26 Aug 2021 10:20:40 +0300 Subject: [PATCH 15/18] Upgrade nginx version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3d681f8..8241977 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.18-alpine +FROM nginx:1.20-alpine MAINTAINER Reittiopas version: 0.1 ENV INSTALL_DIR="/opt/nginx" From 9ea3fa45864697f1e4f0b6a2c65490b7859f2218 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Wed, 1 Sep 2021 21:49:26 +0300 Subject: [PATCH 16/18] Add external endpoint for perille.fi --- external.conf | 7 +++++++ run.sh | 1 + test.sh | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/external.conf b/external.conf index 672377a..fc75ccb 100644 --- a/external.conf +++ b/external.conf @@ -345,3 +345,10 @@ location /out/koutsi.mattersoft.fi/ { proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504; proxy_set_header Authorization KOUVOLA_BASIC_AUTH; } + +#perille gtfs +location /out/gtfs.perille.fi/ { + proxy_pass https://gtfs.perille.fi/; + include allowed-ips.conf; + proxy_set_header Authorization PERILLE_BASIC_AUTH; +} diff --git a/run.sh b/run.sh index cc304fd..e1979e0 100755 --- a/run.sh +++ b/run.sh @@ -31,6 +31,7 @@ sed -i "s/MIKKELI_BASIC_AUTH/${MIKKELI_BASIC_AUTH}/" /etc/nginx/external.conf sed -i "s/VAASA_BASIC_AUTH/${VAASA_BASIC_AUTH}/" /etc/nginx/external.conf sed -i "s/SALO_BASIC_AUTH/${SALO_BASIC_AUTH}/" /etc/nginx/external.conf sed -i "s/KOUVOLA_BASIC_AUTH/${KOUVOLA_BASIC_AUTH}/" /etc/nginx/external.conf +sed -i "s/PERILLE_BASIC_AUTH/${PERILLE_BASIC_AUTH}/" /etc/nginx/external.conf #start nginx nginx diff --git a/test.sh b/test.sh index 86e3c14..1d22a98 100755 --- a/test.sh +++ b/test.sh @@ -26,7 +26,7 @@ CONTAINER_ID=`docker run -d -p 9000:8080 $ADDHOSTS -e VILKKU_BASIC_AUTH="\"test\ -e HAMEENLINNA_BASIC_AUTH="\"test\"" -e NEW_HSL_FI_URL=uusi.hsl.fi \ -e LMJ_BASIC_AUTH="\"test\"" -e MIKKELI_BASIC_AUTH="\"test\"" \ -e VAASA_BASIC_AUTH="\"test\"" -e SALO_BASIC_AUTH="\"test\"" \ - -e KOUVOLA_BASIC_AUTH="\"test\"" hsldevcom/digitransit-proxy:integrationtest` + -e KOUVOLA_BASIC_AUTH="\"test\"" -e PERILLE_BASIC_AUTH="\"test\"" hsldevcom/digitransit-proxy:integrationtest` curl -v http://127.0.0.1:9000 From 1f3fe093567d861237e9ad2edf480d1f24e92486 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Wed, 1 Sep 2021 21:51:29 +0300 Subject: [PATCH 17/18] Remove unused matkahuolto external endpoints --- external.conf | 84 --------------------------------------------------- run.sh | 12 -------- test.sh | 6 ---- 3 files changed, 102 deletions(-) diff --git a/external.conf b/external.conf index fc75ccb..ce1f9f8 100644 --- a/external.conf +++ b/external.conf @@ -161,90 +161,6 @@ location /out/en-api.sharingos.com/ { proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504; } -#Matkahuolto kainuu gtfs (https://minfoapi.matkahuolto.fi/gtfs/kainuu-fi/gtfs.zip ) -location /out/minfoapi.matkahuolto.fi/gtfs/kainuu-fi/ { - proxy_pass https://minfoapi.matkahuolto.fi/gtfs/kainuu-fi/; - include allowed-ips.conf; - proxy_set_header Authorization MATKAHUOLTO_KAINUU_BASIC_AUTH; -} - -#Matkahuolto savo gtfs (https://minfoapi.matkahuolto.fi/gtfs/savo-fi/gtfs.zip ) -location /out/minfoapi.matkahuolto.fi/gtfs/savo-fi/ { - proxy_pass https://minfoapi.matkahuolto.fi/gtfs/savo-fi/; - include allowed-ips.conf; - proxy_set_header Authorization MATKAHUOLTO_SAVO_BASIC_AUTH; -} - -#Matkahuolto kanta gtfs (https://minfoapi.matkahuolto.fi/gtfs/kanta-fi/gtfs.zip ) -location /out/minfoapi.matkahuolto.fi/gtfs/kanta-fi/ { - proxy_pass https://minfoapi.matkahuolto.fi/gtfs/kanta-fi/; - include allowed-ips.conf; - proxy_set_header Authorization MATKAHUOLTO_KANTA_BASIC_AUTH; -} - -#Matkahuolto karjala gtfs (https://minfoapi.matkahuolto.fi/gtfs/karjala-fi/gtfs.zip ) -location /out/minfoapi.matkahuolto.fi/gtfs/karjala-fi/ { - proxy_pass https://minfoapi.matkahuolto.fi/gtfs/karjala-fi/; - include allowed-ips.conf; - proxy_set_header Authorization MATKAHUOLTO_KARJALA_BASIC_AUTH; -} - -#Matkahuolto keski gtfs (https://minfoapi.matkahuolto.fi/gtfs/keski-fi/gtfs.zip ) -location /out/minfoapi.matkahuolto.fi/gtfs/keski-fi/ { - proxy_pass https://minfoapi.matkahuolto.fi/gtfs/keski-fi/; - include allowed-ips.conf; - proxy_set_header Authorization MATKAHUOLTO_KESKI_BASIC_AUTH; -} - -#Matkahuolto kyme gtfs (https://minfoapi.matkahuolto.fi/gtfs/kyme-fi/gtfs.zip ) -location /out/minfoapi.matkahuolto.fi/gtfs/kyme-fi/ { - proxy_pass https://minfoapi.matkahuolto.fi/gtfs/kyme-fi/; - include allowed-ips.conf; - proxy_set_header Authorization MATKAHUOLTO_KYME_BASIC_AUTH; -} - -#Matkahuolto lappi gtfs (https://minfoapi.matkahuolto.fi/gtfs/lappi-fi/gtfs.zip ) -location /out/minfoapi.matkahuolto.fi/gtfs/lappi-fi/ { - proxy_pass https://minfoapi.matkahuolto.fi/gtfs/lappi-fi/; - include allowed-ips.conf; - proxy_set_header Authorization MATKAHUOLTO_LAPPI_BASIC_AUTH; -} - -#Matkahuolto pohjanmaa gtfs (https://minfoapi.matkahuolto.fi/gtfs/pohjanmaa-fi/gtfs.zip ) -location /out/minfoapi.matkahuolto.fi/gtfs/pohjanmaa-fi/ { - proxy_pass https://minfoapi.matkahuolto.fi/gtfs/pohjanmaa-fi/; - include allowed-ips.conf; - proxy_set_header Authorization MATKAHUOLTO_POHJANMAA_BASIC_AUTH; -} - -#Matkahuolto satakunta gtfs (https://minfoapi.matkahuolto.fi/gtfs/satakunta-fi/gtfs.zip ) -location /out/minfoapi.matkahuolto.fi/gtfs/satakunta-fi/ { - proxy_pass https://minfoapi.matkahuolto.fi/gtfs/satakunta-fi/; - include allowed-ips.conf; - proxy_set_header Authorization MATKAHUOLTO_SATAKUNTA_BASIC_AUTH; -} - -#Matkahuolto vakka gtfs (https://minfoapi.matkahuolto.fi/gtfs/vakka-fi/gtfs.zip ) -location /out/minfoapi.matkahuolto.fi/gtfs/vakka-fi/ { - proxy_pass https://minfoapi.matkahuolto.fi/gtfs/vakka-fi/; - include allowed-ips.conf; - proxy_set_header Authorization MATKAHUOLTO_VAKKA_BASIC_AUTH; -} - -#Matkahuolto vantaa gtfs (https://minfoapi.matkahuolto.fi/gtfs/vantaa-fi/gtfs.zip ) -location /out/minfoapi.matkahuolto.fi/gtfs/vantaa-fi/ { - proxy_pass https://minfoapi.matkahuolto.fi/gtfs/vantaa-fi/; - include allowed-ips.conf; - proxy_set_header Authorization MATKAHUOLTO_VANTAA_BASIC_AUTH; -} - -#Matkahuolto varsinais gtfs (https://minfoapi.matkahuolto.fi/gtfs/varsinais-fi/gtfs.zip ) -location /out/minfoapi.matkahuolto.fi/gtfs/varsinais-fi/ { - proxy_pass https://minfoapi.matkahuolto.fi/gtfs/varsinais-fi/; - include allowed-ips.conf; - proxy_set_header Authorization MATKAHUOLTO_VARSINAIS_BASIC_AUTH; -} - #Oulu bike stations (https://poland.nextbike.net/maps/nextbike-official.json?domains=fo) location /out/poland.nextbike.net/ { proxy_pass https://poland.nextbike.net/; diff --git a/run.sh b/run.sh index e1979e0..8664b19 100755 --- a/run.sh +++ b/run.sh @@ -12,18 +12,6 @@ sed -i "s/LINKKI_BASIC_AUTH/${LINKKI_BASIC_AUTH}/" /etc/nginx/external.conf sed -i "s/NEW_LISSU_BASIC_AUTH/${NEW_LISSU_BASIC_AUTH}/" /etc/nginx/external.conf sed -i "s/transitdatadev/${HSL_RT_STORAGE_NAME}/" /etc/nginx/common.conf sed -i "s/LAHTI_BASIC_AUTH/${LAHTI_BASIC_AUTH}/" /etc/nginx/external.conf -sed -i "s/MATKAHUOLTO_KAINUU_BASIC_AUTH/${MATKAHUOLTO_KAINUU_BASIC_AUTH}/" /etc/nginx/external.conf -sed -i "s/MATKAHUOLTO_SAVO_BASIC_AUTH/${MATKAHUOLTO_SAVO_BASIC_AUTH}/" /etc/nginx/external.conf -sed -i "s/MATKAHUOLTO_KANTA_BASIC_AUTH/${MATKAHUOLTO_KANTA_BASIC_AUTH}/" /etc/nginx/external.conf -sed -i "s/MATKAHUOLTO_KARJALA_BASIC_AUTH/${MATKAHUOLTO_KARJALA_BASIC_AUTH}/" /etc/nginx/external.conf -sed -i "s/MATKAHUOLTO_KESKI_BASIC_AUTH/${MATKAHUOLTO_KESKI_BASIC_AUTH}/" /etc/nginx/external.conf -sed -i "s/MATKAHUOLTO_KYME_BASIC_AUTH/${MATKAHUOLTO_KYME_BASIC_AUTH}/" /etc/nginx/external.conf -sed -i "s/MATKAHUOLTO_LAPPI_BASIC_AUTH/${MATKAHUOLTO_LAPPI_BASIC_AUTH}/" /etc/nginx/external.conf -sed -i "s/MATKAHUOLTO_POHJANMAA_BASIC_AUTH/${MATKAHUOLTO_POHJANMAA_BASIC_AUTH}/" /etc/nginx/external.conf -sed -i "s/MATKAHUOLTO_SATAKUNTA_BASIC_AUTH/${MATKAHUOLTO_SATAKUNTA_BASIC_AUTH}/" /etc/nginx/external.conf -sed -i "s/MATKAHUOLTO_VAKKA_BASIC_AUTH/${MATKAHUOLTO_VAKKA_BASIC_AUTH}/" /etc/nginx/external.conf -sed -i "s/MATKAHUOLTO_VANTAA_BASIC_AUTH/${MATKAHUOLTO_VANTAA_BASIC_AUTH}/" /etc/nginx/external.conf -sed -i "s/MATKAHUOLTO_VARSINAIS_BASIC_AUTH/${MATKAHUOLTO_VARSINAIS_BASIC_AUTH}/" /etc/nginx/external.conf sed -i "s/HAMEENLINNA_BASIC_AUTH/${HAMEENLINNA_BASIC_AUTH}/" /etc/nginx/external.conf sed -i "s/dev.hslfi.hsldev.com/${NEW_HSL_FI_URL}/" /etc/nginx/nginx.conf sed -i "s/LMJ_BASIC_AUTH/${LMJ_BASIC_AUTH}/" /etc/nginx/external.conf diff --git a/test.sh b/test.sh index 1d22a98..1a635b8 100755 --- a/test.sh +++ b/test.sh @@ -17,12 +17,6 @@ echo $ADDHOSTS CONTAINER_ID=`docker run -d -p 9000:8080 $ADDHOSTS -e VILKKU_BASIC_AUTH="\"test\"" \ -e JOJO_BASIC_AUTH="\"test\"" -e LAPPEENRANTA_BASIC_AUTH="\"test\"" -e LINKKI_BASIC_AUTH="\"test\"" \ -e NEW_LISSU_BASIC_AUTH="\"test\"" -e LAHTI_BASIC_AUTH="\"test\"" -e HSL_RT_STORAGE_NAME=transitdataprod \ - -e MATKAHUOLTO_KAINUU_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_SAVO_BASIC_AUTH="\"test\"" \ - -e MATKAHUOLTO_KANTA_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_KARJALA_BASIC_AUTH="\"test\"" \ - -e MATKAHUOLTO_KESKI_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_KYME_BASIC_AUTH="\"test\"" \ - -e MATKAHUOLTO_LAPPI_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_POHJANMAA_BASIC_AUTH="\"test\"" \ - -e MATKAHUOLTO_SATAKUNTA_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_VAKKA_BASIC_AUTH="\"test\"" \ - -e MATKAHUOLTO_VANTAA_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_VARSINAIS_BASIC_AUTH="\"test\"" \ -e HAMEENLINNA_BASIC_AUTH="\"test\"" -e NEW_HSL_FI_URL=uusi.hsl.fi \ -e LMJ_BASIC_AUTH="\"test\"" -e MIKKELI_BASIC_AUTH="\"test\"" \ -e VAASA_BASIC_AUTH="\"test\"" -e SALO_BASIC_AUTH="\"test\"" \ From 1935a1aa70bb6c86552525cf4fe0539c098ef59b Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 2 Sep 2021 10:38:46 +0300 Subject: [PATCH 18/18] Increase server_names_hash_bucket_size --- nginx.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nginx.conf b/nginx.conf index 3b92995..9a6e350 100644 --- a/nginx.conf +++ b/nginx.conf @@ -46,6 +46,9 @@ http { # hide server version from response server_tokens off; + # to get rid of a warning about server_names_hash building + server_names_hash_bucket_size 128; + # API endpoints # These domains handle only api calls, not UI # a-,b-,c- prefixes are ment to be used with map raster image multidomain support