From 3a8678578d68bc23543570238a7aab137480fcf4 Mon Sep 17 00:00:00 2001 From: Heikki Vuorinen Date: Mon, 9 Mar 2026 12:41:09 +0200 Subject: [PATCH 1/3] new proxy endpoint for frends api --- external.conf | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/external.conf b/external.conf index 5bb98f4..1acaf0c 100644 --- a/external.conf +++ b/external.conf @@ -320,6 +320,19 @@ location /out/raumaadmin.mattersoft.fi/ { proxy_set_header Authorization RAUMA_STATIC_BASIC_AUTH; } +#frendsapp test gtfs (zip + gtfs-rt) +location /out/waltti-cloudtest-agent.frendsapp.com/ { + proxy_pass https://waltti-cloudtest-agent.frendsapp.com/; + 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 X-Api-Key FRENDS_API_KEY; +} + #donkey citybike api (for example https://stables.donkey.bike/api/public/gbfs/2/donkey_lappeenranta/gbfs.json) location /out/stables.donkey.bike/ { proxy_pass https://stables.donkey.bike/; From 868be142767d073d08572615721740de7a35e48c Mon Sep 17 00:00:00 2001 From: Heikki Vuorinen Date: Mon, 9 Mar 2026 13:03:08 +0200 Subject: [PATCH 2/3] fix tests --- run.sh | 1 + test.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/run.sh b/run.sh index a88a8f3..c47c36e 100755 --- a/run.sh +++ b/run.sh @@ -32,6 +32,7 @@ sed -i "s/NYSSE_BASIC_AUTH/${NYSSE_BASIC_AUTH}/" /etc/nginx/external.conf sed -i "s/WALTTI_TEST_STATIC_BASIC_AUTH/${WALTTI_TEST_STATIC_BASIC_AUTH}/" /etc/nginx/external.conf sed -i "s#CDN_BASE_URL#${CDN_BASE_URL}#" /etc/nginx/common.conf sed -i "s/MOBILITY_API_KEY/${MOBILITY_API_KEY}/" /etc/nginx/external.conf +sed -i "s/FRENDS_API_KEY/${FRENDS_API_KEY}/" /etc/nginx/external.conf #set basic auth htpasswd -c -B -b .htpasswd $DEBUG_UI_CREDENTIALS_USER $DEBUG_UI_CREDENTIALS_PASS &>/dev/null diff --git a/test.sh b/test.sh index c9e0a50..ac01d51 100755 --- a/test.sh +++ b/test.sh @@ -27,7 +27,7 @@ CONTAINER_ID=$(docker run -d -p 9000:8080 $ADDHOSTS -e VILKKU_BASIC_AUTH="\"test -e PORI_RT_BASIC_AUTH="\"test\"" -e MH_BASIC_AUTH="\"test\"" -e RAASEPORI_RT_BASIC_AUTH="\"test\"" \ -e WALTTI_TEST_CREDENTIALS_USER="walttitest" -e WALTTI_TEST_CREDENTIALS_PASS="walttitest" -e WALTTI_TEST_STATIC_BASIC_AUTH="\"test\"" \ -e DEBUG_UI_CREDENTIALS_USER="test" -e DEBUG_UI_CREDENTIALS_PASS="test" \ - -e MOBILITY_API_KEY="\"test\"" -e CDN_BASE_URL="test" \ + -e MOBILITY_API_KEY="\"test\"" -e CDN_BASE_URL="test" -e FRENDS_API_KEY="\"test\”" \ hsldevcom/digitransit-proxy:integrationtest) curl -v http://127.0.0.1:9000 From 7a26c5d1bd7d161fe3d5d70f9a1a634a402c7a35 Mon Sep 17 00:00:00 2001 From: Heikki Vuorinen Date: Mon, 9 Mar 2026 13:23:13 +0200 Subject: [PATCH 3/3] remove escaped quotes --- test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.sh b/test.sh index ac01d51..a15fa73 100755 --- a/test.sh +++ b/test.sh @@ -27,7 +27,7 @@ CONTAINER_ID=$(docker run -d -p 9000:8080 $ADDHOSTS -e VILKKU_BASIC_AUTH="\"test -e PORI_RT_BASIC_AUTH="\"test\"" -e MH_BASIC_AUTH="\"test\"" -e RAASEPORI_RT_BASIC_AUTH="\"test\"" \ -e WALTTI_TEST_CREDENTIALS_USER="walttitest" -e WALTTI_TEST_CREDENTIALS_PASS="walttitest" -e WALTTI_TEST_STATIC_BASIC_AUTH="\"test\"" \ -e DEBUG_UI_CREDENTIALS_USER="test" -e DEBUG_UI_CREDENTIALS_PASS="test" \ - -e MOBILITY_API_KEY="\"test\"" -e CDN_BASE_URL="test" -e FRENDS_API_KEY="\"test\”" \ + -e MOBILITY_API_KEY="\"test\"" -e CDN_BASE_URL="test" -e FRENDS_API_KEY="test" \ hsldevcom/digitransit-proxy:integrationtest) curl -v http://127.0.0.1:9000