Merge pull request #146 from HSLdevcom/remove-yleisviesti

Remove yleisviestipalvelu endpoint

Author: Antiik91

nginx.conf

@@ -42,7 +42,6 @@ http {
   proxy_cache_path /opt/nginx/external-cache levels=1:2 keys_zone=ext_cache:10m max_size=1g inactive=60m use_temp_path=off;
   proxy_cache_path /opt/nginx/common levels=1:2 keys_zone=common:10m max_size=4g inactive=60m use_temp_path=off;
   proxy_cache_path /opt/nginx/sw levels=1:2 keys_zone=sw:10m max_size=200m inactive=1m use_temp_path=off;
-  proxy_cache_path /opt/nginx/yleisviesti levels=1:2 keys_zone=yleisviesti:10m max_size=200m inactive=1m use_temp_path=off;
 
   # hide server version from response
   server_tokens off;
@@ -345,41 +344,6 @@ http {
     }
   }
 
-  server {
-    server_name dev-yleisviesti.digitransit.fi yleisviesti.hsl.fi;
-    listen 8080;
-
-    if ($http_x_forwarded_proto != "https") {
-      return 301 https://$host$request_uri;
-    }
-
-    # Add HTTP Strict Transport Security for good measure.
-    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains;";
-
-    location = / {
-      proxy_pass         http://yleisviestipalvelu:8080;
-      proxy_redirect     off;
-      proxy_set_header   X-Real-IP $remote_addr;
-      proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header   X-Forwarded-Host $host;
-      proxy_cache yleisviesti;
-      proxy_cache_valid 200 30s;
-      proxy_cache_lock on;
-      proxy_cache_key "$host";
-      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 / {
-      proxy_pass         http://yleisviestipalvelu:8080;
-      proxy_redirect     off;
-      proxy_set_header   X-Real-IP $remote_addr;
-      proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header   X-Forwarded-Host $host;
-    }
-  }
-
   server {
     server_name digitransit.fi www.digitransit.fi dev-site.digitransit.fi;
     listen 8080;

test.js

@@ -248,15 +248,6 @@ describe('sentry-analytics', function() {
   testRedirect('sentry-analytics.digitransit.fi','/kissa','https://sentry-analytics.digitransit.fi/kissa');
 });
 
-describe('yleisviestipalvelu', function() {
-  testCaching('yleisviesti.hsl.fi','/', true);
-  testProxying('yleisviesti.hsl.fi','/','yleisviestipalvelu:8080', true);
-  testRedirect('yleisviesti.hsl.fi','/kissa','https://yleisviesti.hsl.fi/kissa');
-  testCaching('dev-yleisviesti.digitransit.fi','/', true);
-  testProxying('dev-yleisviesti.digitransit.fi','/','yleisviestipalvelu:8080', true);
-  testRedirect('dev-yleisviesti.digitransit.fi','/kissa','https://dev-yleisviesti.digitransit.fi/kissa');
-});
-
 describe('digitransit', function() {
   testProxying('digitransit.fi','/','digitransit-site:8080', true);
 });