From 1a7c83ddc390bdc5ebc63709db152c826316ce09 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 9 Apr 2020 16:09:57 +0300 Subject: [PATCH 1/3] Remove unused vayla external endpoint --- external.conf | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/external.conf b/external.conf index c5602ce..a65e5c4 100644 --- a/external.conf +++ b/external.conf @@ -46,18 +46,6 @@ location /out/92.62.36.215/ { proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504; } -# Old Livi GTFS-RT for easier migration -location /out/beta.vayla.fi/ { - proxy_pass https://beta.vayla.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; -} - #new livi gtfs rt (https://tyokalu.navici.com/joukkoliikenne/manual-gtfsrt/api/gtfsrt/alerts) location /out/tyokalu.navici.com/ { proxy_pass https://tyokalu.navici.com/; @@ -255,3 +243,15 @@ location /out/poland.nextbike.net/ { 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; } + +#Oulu bike stations (https://poland.nextbike.net/maps/nextbike-official.json?domains=fo) +location /out/poland.nextbike.net/ { + proxy_pass https://poland.nextbike.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; +} From f1283df5023686e34114d03017a11822a8f68b50 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 9 Apr 2020 16:12:51 +0300 Subject: [PATCH 2/3] Add external endpoint for vilkku bikes --- external.conf | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/external.conf b/external.conf index a65e5c4..29a70d3 100644 --- a/external.conf +++ b/external.conf @@ -255,3 +255,15 @@ location /out/poland.nextbike.net/ { 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; } + +#Vilkku (Kuopio) bike stations (https://kaupunkipyorat.kuopio.fi/tkhs-export-map.html?format=xml) +location /out/kaupunkipyorat.kuopio.fi/ { + proxy_pass https://kaupunkipyorat.kuopio.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; +} From da436189ce1584b65154b0d0a5f69c1666fe6ca3 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 9 Apr 2020 16:13:30 +0300 Subject: [PATCH 3/3] Remove duplicate external endpoint left over from a merge probably --- external.conf | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/external.conf b/external.conf index 29a70d3..bdd3603 100644 --- a/external.conf +++ b/external.conf @@ -244,18 +244,6 @@ location /out/poland.nextbike.net/ { proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504; } -#Oulu bike stations (https://poland.nextbike.net/maps/nextbike-official.json?domains=fo) -location /out/poland.nextbike.net/ { - proxy_pass https://poland.nextbike.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; -} - #Vilkku (Kuopio) bike stations (https://kaupunkipyorat.kuopio.fi/tkhs-export-map.html?format=xml) location /out/kaupunkipyorat.kuopio.fi/ { proxy_pass https://kaupunkipyorat.kuopio.fi/;