Skip to content

Commit eee8ee8

Browse files
authored
Merge pull request #216 from HSLdevcom/remove-linjasto2021-properly
Remove couple of old unused domains
2 parents 6f524c6 + 1c5101d commit eee8ee8

File tree

2 files changed

+0
-36
lines changed

2 files changed

+0
-36
lines changed

nginx.conf

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -201,15 +201,6 @@ http {
201201
return 301 https://dev.digitransit.fi;
202202
}
203203

204-
server {
205-
server_name dev-linjasto2021.digitransit.fi linjasto2021.digitransit.fi;
206-
listen 8080;
207-
208-
location / {
209-
return 301 https://reittiopas.tampere.fi;
210-
}
211-
}
212-
213204
server {
214205
server_name dev-hameenlinna.digitransit.fi hameenlinna.digitransit.fi reittiopas.hameenlinna.fi
215206
dev-joensuu.digitransit.fi joensuu.digitransit.fi
@@ -459,23 +450,6 @@ http {
459450
}
460451
}
461452

462-
server {
463-
server_name sentry-analytics.digitransit.fi;
464-
listen 8080;
465-
466-
if ($http_x_forwarded_proto != "https") {
467-
return 301 https://$host$request_uri;
468-
}
469-
470-
# Add HTTP Strict Transport Security for good measure.
471-
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains;";
472-
473-
location / {
474-
proxy_pass http://digitransit-sentry-analytics:8080;
475-
include basicsettings.conf;
476-
}
477-
}
478-
479453
server {
480454
server_name dev-matka-yleisviesti.digitransit.fi matka-yleisviesti.digitransit.fi;
481455
listen 8080;

test.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,6 @@ describe('waltti ui', function() {
252252
});
253253
});
254254
});
255-
256-
describe('linjasto2021 ui', function() {
257-
testRedirect('linjasto2021.digitransit.fi','/kissa','https://reittiopas.tampere.fi');
258-
});
259-
260-
describe('sentry-analytics', function() {
261-
testProxying('sentry-analytics.digitransit.fi','/','digitransit-sentry-analytics:8080', true);
262-
testRedirect('sentry-analytics.digitransit.fi','/kissa','https://sentry-analytics.digitransit.fi/kissa');
263-
});
264-
265255
describe('yleisviestipalvelu', function() {
266256
testCaching('matka-yleisviesti.digitransit.fi','/', true);
267257
testProxying('matka-yleisviesti.digitransit.fi','/','yleisviestipalvelu:8080', true);

0 commit comments

Comments
 (0)