Skip to content

Commit

Permalink
Merge pull request #172 from HSLdevcom/perille-external
Browse files Browse the repository at this point in the history 
Perille external
  • Loading branch information
@vesameskanen
vesameskanen authored Sep 2, 2021
2 parents c9fcfac + 1935a1a commit 3b759bd
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 103 deletions.
91 changes: 7 additions & 84 deletions external.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,90 +161,6 @@ location /out/en-api.sharingos.com/ {
proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;
}

#Matkahuolto kainuu gtfs (https://minfoapi.matkahuolto.fi/gtfs/kainuu-fi/gtfs.zip )
location /out/minfoapi.matkahuolto.fi/gtfs/kainuu-fi/ {
proxy_pass https://minfoapi.matkahuolto.fi/gtfs/kainuu-fi/;
include allowed-ips.conf;
proxy_set_header Authorization MATKAHUOLTO_KAINUU_BASIC_AUTH;
}

#Matkahuolto savo gtfs (https://minfoapi.matkahuolto.fi/gtfs/savo-fi/gtfs.zip )
location /out/minfoapi.matkahuolto.fi/gtfs/savo-fi/ {
proxy_pass https://minfoapi.matkahuolto.fi/gtfs/savo-fi/;
include allowed-ips.conf;
proxy_set_header Authorization MATKAHUOLTO_SAVO_BASIC_AUTH;
}

#Matkahuolto kanta gtfs (https://minfoapi.matkahuolto.fi/gtfs/kanta-fi/gtfs.zip )
location /out/minfoapi.matkahuolto.fi/gtfs/kanta-fi/ {
proxy_pass https://minfoapi.matkahuolto.fi/gtfs/kanta-fi/;
include allowed-ips.conf;
proxy_set_header Authorization MATKAHUOLTO_KANTA_BASIC_AUTH;
}

#Matkahuolto karjala gtfs (https://minfoapi.matkahuolto.fi/gtfs/karjala-fi/gtfs.zip )
location /out/minfoapi.matkahuolto.fi/gtfs/karjala-fi/ {
proxy_pass https://minfoapi.matkahuolto.fi/gtfs/karjala-fi/;
include allowed-ips.conf;
proxy_set_header Authorization MATKAHUOLTO_KARJALA_BASIC_AUTH;
}

#Matkahuolto keski gtfs (https://minfoapi.matkahuolto.fi/gtfs/keski-fi/gtfs.zip )
location /out/minfoapi.matkahuolto.fi/gtfs/keski-fi/ {
proxy_pass https://minfoapi.matkahuolto.fi/gtfs/keski-fi/;
include allowed-ips.conf;
proxy_set_header Authorization MATKAHUOLTO_KESKI_BASIC_AUTH;
}

#Matkahuolto kyme gtfs (https://minfoapi.matkahuolto.fi/gtfs/kyme-fi/gtfs.zip )
location /out/minfoapi.matkahuolto.fi/gtfs/kyme-fi/ {
proxy_pass https://minfoapi.matkahuolto.fi/gtfs/kyme-fi/;
include allowed-ips.conf;
proxy_set_header Authorization MATKAHUOLTO_KYME_BASIC_AUTH;
}

#Matkahuolto lappi gtfs (https://minfoapi.matkahuolto.fi/gtfs/lappi-fi/gtfs.zip )
location /out/minfoapi.matkahuolto.fi/gtfs/lappi-fi/ {
proxy_pass https://minfoapi.matkahuolto.fi/gtfs/lappi-fi/;
include allowed-ips.conf;
proxy_set_header Authorization MATKAHUOLTO_LAPPI_BASIC_AUTH;
}

#Matkahuolto pohjanmaa gtfs (https://minfoapi.matkahuolto.fi/gtfs/pohjanmaa-fi/gtfs.zip )
location /out/minfoapi.matkahuolto.fi/gtfs/pohjanmaa-fi/ {
proxy_pass https://minfoapi.matkahuolto.fi/gtfs/pohjanmaa-fi/;
include allowed-ips.conf;
proxy_set_header Authorization MATKAHUOLTO_POHJANMAA_BASIC_AUTH;
}

#Matkahuolto satakunta gtfs (https://minfoapi.matkahuolto.fi/gtfs/satakunta-fi/gtfs.zip )
location /out/minfoapi.matkahuolto.fi/gtfs/satakunta-fi/ {
proxy_pass https://minfoapi.matkahuolto.fi/gtfs/satakunta-fi/;
include allowed-ips.conf;
proxy_set_header Authorization MATKAHUOLTO_SATAKUNTA_BASIC_AUTH;
}

#Matkahuolto vakka gtfs (https://minfoapi.matkahuolto.fi/gtfs/vakka-fi/gtfs.zip )
location /out/minfoapi.matkahuolto.fi/gtfs/vakka-fi/ {
proxy_pass https://minfoapi.matkahuolto.fi/gtfs/vakka-fi/;
include allowed-ips.conf;
proxy_set_header Authorization MATKAHUOLTO_VAKKA_BASIC_AUTH;
}

#Matkahuolto vantaa gtfs (https://minfoapi.matkahuolto.fi/gtfs/vantaa-fi/gtfs.zip )
location /out/minfoapi.matkahuolto.fi/gtfs/vantaa-fi/ {
proxy_pass https://minfoapi.matkahuolto.fi/gtfs/vantaa-fi/;
include allowed-ips.conf;
proxy_set_header Authorization MATKAHUOLTO_VANTAA_BASIC_AUTH;
}

#Matkahuolto varsinais gtfs (https://minfoapi.matkahuolto.fi/gtfs/varsinais-fi/gtfs.zip )
location /out/minfoapi.matkahuolto.fi/gtfs/varsinais-fi/ {
proxy_pass https://minfoapi.matkahuolto.fi/gtfs/varsinais-fi/;
include allowed-ips.conf;
proxy_set_header Authorization MATKAHUOLTO_VARSINAIS_BASIC_AUTH;
}

#Oulu bike stations (https://poland.nextbike.net/maps/nextbike-official.json?domains=fo)
location /out/poland.nextbike.net/ {
proxy_pass https://poland.nextbike.net/;
Expand Down Expand Up @@ -345,3 +261,10 @@ location /out/koutsi.mattersoft.fi/ {
proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;
proxy_set_header Authorization KOUVOLA_BASIC_AUTH;
}

#perille gtfs
location /out/gtfs.perille.fi/ {
proxy_pass https://gtfs.perille.fi/;
include allowed-ips.conf;
proxy_set_header Authorization PERILLE_BASIC_AUTH;
}
3 changes: 3 additions & 0 deletions nginx.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ http {
# hide server version from response
server_tokens off;

# to get rid of a warning about server_names_hash building
server_names_hash_bucket_size 128;

# API endpoints
# These domains handle only api calls, not UI
# a-,b-,c- prefixes are ment to be used with map raster image multidomain support
Expand Down
13 changes: 1 addition & 12 deletions run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,14 @@ 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/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
sed -i "s/MATKAHUOLTO_SAVO_BASIC_AUTH/${MATKAHUOLTO_SAVO_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/MATKAHUOLTO_KANTA_BASIC_AUTH/${MATKAHUOLTO_KANTA_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/MATKAHUOLTO_KARJALA_BASIC_AUTH/${MATKAHUOLTO_KARJALA_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/MATKAHUOLTO_KESKI_BASIC_AUTH/${MATKAHUOLTO_KESKI_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/MATKAHUOLTO_KYME_BASIC_AUTH/${MATKAHUOLTO_KYME_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/MATKAHUOLTO_LAPPI_BASIC_AUTH/${MATKAHUOLTO_LAPPI_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/MATKAHUOLTO_POHJANMAA_BASIC_AUTH/${MATKAHUOLTO_POHJANMAA_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/MATKAHUOLTO_SATAKUNTA_BASIC_AUTH/${MATKAHUOLTO_SATAKUNTA_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/MATKAHUOLTO_VAKKA_BASIC_AUTH/${MATKAHUOLTO_VAKKA_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/MATKAHUOLTO_VANTAA_BASIC_AUTH/${MATKAHUOLTO_VANTAA_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/MATKAHUOLTO_VARSINAIS_BASIC_AUTH/${MATKAHUOLTO_VARSINAIS_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/HAMEENLINNA_BASIC_AUTH/${HAMEENLINNA_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/dev.hslfi.hsldev.com/${NEW_HSL_FI_URL}/" /etc/nginx/nginx.conf
sed -i "s/LMJ_BASIC_AUTH/${LMJ_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/MIKKELI_BASIC_AUTH/${MIKKELI_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/VAASA_BASIC_AUTH/${VAASA_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/SALO_BASIC_AUTH/${SALO_BASIC_AUTH}/" /etc/nginx/external.conf
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

#start nginx
nginx
8 changes: 1 addition & 7 deletions test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,10 @@ 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 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\"" \
-e MATKAHUOLTO_LAPPI_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_POHJANMAA_BASIC_AUTH="\"test\"" \
-e MATKAHUOLTO_SATAKUNTA_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_VAKKA_BASIC_AUTH="\"test\"" \
-e MATKAHUOLTO_VANTAA_BASIC_AUTH="\"test\"" -e MATKAHUOLTO_VARSINAIS_BASIC_AUTH="\"test\"" \
-e HAMEENLINNA_BASIC_AUTH="\"test\"" -e NEW_HSL_FI_URL=uusi.hsl.fi \
-e LMJ_BASIC_AUTH="\"test\"" -e MIKKELI_BASIC_AUTH="\"test\"" \
-e VAASA_BASIC_AUTH="\"test\"" -e SALO_BASIC_AUTH="\"test\"" \
-e KOUVOLA_BASIC_AUTH="\"test\"" hsldevcom/digitransit-proxy:integrationtest`
-e KOUVOLA_BASIC_AUTH="\"test\"" -e PERILLE_BASIC_AUTH="\"test\"" hsldevcom/digitransit-proxy:integrationtest`

curl -v http://127.0.0.1:9000

Expand Down

0 comments on commit 3b759bd

Please sign in to comment.