Merge pull request #217 from HSLdevcom/rauma-external

Add rauma external endpoints

Author: vesameskanen

.github/workflows/dev-pipeline.yml

@@ -8,7 +8,7 @@ on:
       - master
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         node-version: [10.x]
@@ -27,7 +27,7 @@ jobs:
     if: github.ref == 'refs/heads/master'
     needs:
       - test
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/prod-pipeline.yml

@@ -5,7 +5,7 @@ on:
       - published
 jobs:
   prod-push:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2

external.conf

@@ -290,6 +290,32 @@ location /out/kajaani.mattersoft.fi/ {
   proxy_set_header Authorization KAJAANI_BASIC_AUTH;
 }
 
+#rauma gtfs rt (https://rauma.mattersoft.fi/api/gtfsrealtime/v1.0/feed/tripupdate, servicealert and vehicleposition)
+location /out/rauma.mattersoft.fi/ {
+  proxy_pass    https://rauma.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 RAUMA_RT_BASIC_AUTH;
+}
+
+#rauma gtfs (https://raumaadmin.mattersoft.fi/feeds/233.zip)
+location /out/raumaadmin.mattersoft.fi/ {
+  proxy_pass    https://raumaadmin.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 RAUMA_STATIC_BASIC_AUTH;
+}
+
 #perille gtfs
 location /out/gtfs.perille.fi/ {
   proxy_pass    https://gtfs.perille.fi/;

run.sh

@@ -26,6 +26,8 @@ sed -i "s/ROVANIEMI_BASIC_AUTH/${ROVANIEMI_BASIC_AUTH}/" /etc/nginx/external.con
 sed -i "s/KAJAANI_BASIC_AUTH/${KAJAANI_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
+sed -i "s/RAUMA_RT_BASIC_AUTH/${RAUMA_RT_BASIC_AUTH}/" /etc/nginx/external.conf
+sed -i "s/RAUMA_STATIC_BASIC_AUTH/${RAUMA_STATIC_BASIC_AUTH}/" /etc/nginx/external.conf
 
 #start nginx
 nginx

test.sh

@@ -23,6 +23,7 @@ CONTAINER_ID=$(docker run -d -p 9000:8080 $ADDHOSTS -e VILKKU_BASIC_AUTH="\"test
   -e KOUVOLA_BASIC_AUTH="\"test\"" -e PERILLE_BASIC_AUTH="\"test\"" -e KAJAANI_BASIC_AUTH="\"test\"" \
   -e GIRAVOLTA_TAMPERE_AUTH="\"test\"" -e KOTKA_BASIC_AUTH="\"test\"" \
   -e GIRAVOLTA_VANTAA_AUTH="\"test\"" -e VARELY_BASIC_AUTH="\"test\"" \
+  -e RAUMA_RT_BASIC_AUTH="\"test\"" -e RAUMA_STATIC_BASIC_AUTH="\"test\"" \
   hsldevcom/digitransit-proxy:integrationtest)
 
 curl -v http://127.0.0.1:9000