diff --git a/nginx.conf b/nginx.conf index d0c6fd2..b280fdc 100644 --- a/nginx.conf +++ b/nginx.conf @@ -192,7 +192,7 @@ http { dev-joensuu.digitransit.fi joensuu.digitransit.fi dev-jyvaskyla.digitransit.fi jyvaskyla.digitransit.fi dev-kotka.digitransit.fi kotka.digitransit.fi - dev-kuopio.digitransit.fi kuopio.digitransit.fi reittiopas.kuopio.fi + dev-kuopio.digitransit.fi reittiopas.kuopio.fi dev-lahti.digitransit.fi lahti.digitransit.fi dev-lappeenranta.digitransit.fi lappeenranta.digitransit.fi dev-mikkeli.digitransit.fi mikkeli.digitransit.fi @@ -404,6 +404,40 @@ http { } } + server { + server_name kuopio.digitransit.fi; + listen 8080; + + # Prevent search engines from indexing the site + add_header X-Robots-Tag "noindex, nofollow, nosnippet, noarchive"; + + location = /sw.js { + proxy_pass https://serviceworker.blob.core.windows.net/serviceworker/destroy-sw.js; + proxy_set_header Host serviceworker.blob.core.windows.net; + proxy_cache common; + proxy_cache_valid 200 5m; + 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; + } + location = /appcache/manifest.appcache { + proxy_pass https://serviceworker.blob.core.windows.net/appcache/destroy-manifest.appcache; + default_type text/cache-manifest; + proxy_set_header Host serviceworker.blob.core.windows.net; + proxy_cache common; + proxy_cache_valid 200 5m; + 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; + } + + location / { + return 301 https://reittiopas.kuopio.fi$request_uri; + } + } + server { server_name digitransit.fi www.digitransit.fi dev.digitransit.fi; listen 8080; diff --git a/test.js b/test.js index 2dda2d3..8e02067 100644 --- a/test.js +++ b/test.js @@ -249,7 +249,7 @@ describe('fintraffic ui', function() { describe('waltti ui', function() { const walttiCities = [ - 'hameenlinna', 'joensuu', 'jyvaskyla', 'kotka', 'kuopio', 'lahti', 'lappeenranta', + 'hameenlinna', 'joensuu', 'jyvaskyla', 'kotka', 'lahti', 'lappeenranta', 'mikkeli', 'turku', 'tampere','kouvola', 'rovaniemi','vaasa' ]; @@ -291,6 +291,8 @@ describe('waltti ui', function() { testRedirect('reittiopas.kuopio.fi','/kissa','https://reittiopas.kuopio.fi/kissa'); testProxying('reittiopas.kuopio.fi','/','digitransit-ui-waltti-v3:8080', true); + testRedirect('kuopio.digitransit.fi','/kissa','https://reittiopas.kuopio.fi/kissa'); + it('https should not redirect', function(done) { httpsGet('turku.digitransit.fi','/kissa').end((err,res)=>{ expect(err).to.be.null;