Merge pull request #207 from HSLdevcom/DT-5539

Rovaniemi real time proxy DT-5539
HSLdevcom · Oct 4, 2022 · 7a8c5c9 · 7a8c5c9
2 parents 5fb1c0b + 213b43c
commit 7a8c5c9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/external.conf b/external.conf
@@ -264,6 +264,19 @@ location /out/jonnejaminne.mattersoft.fi/ {
   proxy_set_header Authorization KOTKA_BASIC_AUTH;
 }
 
+#rovaniemi gtfs rt (https://linkkari.mattersoft.fi/api/gtfsrealtime/v1.0/feed/tripupdate, servicealert and vehicleposition)
+location /out/linkkari.mattersoft.fi/ {
+  proxy_pass    https://linkkari.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 ROVANIEMI_BASIC_AUTH;
+}
+
 #perille gtfs
 location /out/gtfs.perille.fi/ {
   proxy_pass    https://gtfs.perille.fi/;

diff --git a/run.sh b/run.sh
@@ -22,6 +22,7 @@ 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
 sed -i "s/GIRAVOLTA_TAMPERE_AUTH/${GIRAVOLTA_TAMPERE_AUTH}/" /etc/nginx/external.conf
 sed -i "s/KOTKA_BASIC_AUTH/${KOTKA_BASIC_AUTH}/" /etc/nginx/external.conf
+sed -i "s/ROVANIEMI_BASIC_AUTH/${ROVANIEMI_BASIC_AUTH}/" /etc/nginx/external.conf
 sed -i "s/GIRAVOLTA_VANTAA_AUTH/${GIRAVOLTA_VANTAA_AUTH}/" /etc/nginx/external.conf
 sed -i "s/VARELY_BASIC_AUTH/${VARELY_BASIC_AUTH}/" /etc/nginx/external.conf
 

diff --git a/test.sh b/test.sh
@@ -19,7 +19,7 @@ CONTAINER_ID=$(docker run -d -p 9000:8080 $ADDHOSTS -e VILKKU_BASIC_AUTH="\"test
   -e NEW_LISSU_BASIC_AUTH="\"test\"" -e LAHTI_BASIC_AUTH="\"test\"" -e HSL_RT_STORAGE_NAME=transitdataprod \
   -e HAMEENLINNA_BASIC_AUTH="\"test\"" -e NEW_HSL_FI_URL=hsl.fi \
   -e LMJ_BASIC_AUTH="\"test\"" -e MIKKELI_BASIC_AUTH="\"test\"" \
-  -e VAASA_BASIC_AUTH="\"test\"" -e SALO_BASIC_AUTH="\"test\"" \
+  -e VAASA_BASIC_AUTH="\"test\"" -e SALO_BASIC_AUTH="\"test\"" -e ROVANIEMI_BASIC_AUTH="\"test\"" \
   -e KOUVOLA_BASIC_AUTH="\"test\"" -e PERILLE_BASIC_AUTH="\"test\"" \
   -e GIRAVOLTA_TAMPERE_AUTH="\"test\"" -e KOTKA_BASIC_AUTH="\"test\"" \
   -e GIRAVOLTA_VANTAA_AUTH="\"test\"" -e VARELY_BASIC_AUTH="\"test\"" \