Merge pull request #122 from HSLdevcom/remove-samocat

Remove samocat external endpoint
HSLdevcom · Feb 12, 2020 · a15fdc1 · a15fdc1
2 parents b83f7a5 + 8e4f1d4
commit a15fdc1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/external.conf b/external.conf
@@ -123,19 +123,6 @@ location /out/tre.mattersoft.fi/ {
   proxy_set_header Authorization NEW_LISSU_BASIC_AUTH;
 }
 
-#Samocat scooter stations (https://finagent.samocat.net/api/stations_info/)
-location /out/finagent.samocat.net/ {
-  proxy_pass    https://finagent.samocat.net/;
-  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 SAMOCAT_TOKEN_AUTH;
-}
-
 #lahti gtfs rt  (https://lsl.mattersoft.fi/api/gtfsrealtime/v1.0/feed/tripupdate, servicealert and vehicleposition)
 location /out/lsl.mattersoft.fi/ {
   proxy_pass    https://lsl.mattersoft.fi/;

diff --git a/run.sh b/run.sh
@@ -10,7 +10,6 @@ sed -i "s/JOJO_BASIC_AUTH/${JOJO_BASIC_AUTH}/" /etc/nginx/external.conf
 sed -i "s/LAPPEENRANTA_BASIC_AUTH/${LAPPEENRANTA_BASIC_AUTH}/" /etc/nginx/external.conf
 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/SAMOCAT_TOKEN_AUTH/${SAMOCAT_TOKEN_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

diff --git a/test.sh b/test.sh
@@ -16,8 +16,7 @@ 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 SAMOCAT_TOKEN_AUTH="\"test\"" \
-  -e LAHTI_BASIC_AUTH="\"test\"" -e HSL_RT_STORAGE_NAME=transitdataprod \
+  -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\"" \