Skip to content

Commit

Permalink
Merge pull request #239 from HSLdevcom/DT-6033
Browse files Browse the repository at this point in the history
dt-6033 raasepori config
  • Loading branch information
vesameskanen authored Sep 21, 2023
2 parents 6afd3dc + f185373 commit 23e7ee6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
3 changes: 2 additions & 1 deletion nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ http {
dev-opas.waltti.fi next-dev-opas.waltti.fi dev-opas.waltti.fi opas.waltti.fi
dev-vaasa.digitransit.fi next-dev-vaasa.digitransit.fi vaasa.digitransit.fi
dev-pori.digitransit.fi next-dev-pori.digitransit.fi pori.digitransit.fi
dev-varely.digitransit.fi varely.digitransit.fi reittiopas.seutuplus.fi;
dev-varely.digitransit.fi varely.digitransit.fi reittiopas.seutuplus.fi
dev-raasepori.digitransit.fi next-dev-raasepori.digitransit.fi bosse.digitransit.fi;
listen 8080;

if ($http_x_forwarded_proto != "https") {
Expand Down
7 changes: 7 additions & 0 deletions test.js
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,13 @@ describe('waltti ui', function() {
testRedirect('next-dev-opas.waltti.fi','/kissa','https://next-dev-opas.waltti.fi/kissa');
testProxying('next-dev-opas.waltti.fi','/','digitransit-ui-waltti-v3:8080', true);

testRedirect('dev-raasepori.digitransit.fi','/kissa','https://dev-raasepori.digitransit.fi/kissa');
testProxying('dev-raasepori.digitransit.fi','/','digitransit-ui-waltti-v3:8080', true);
testRedirect('next-dev-raasepori.digitransit.fi','/kissa','https://next-dev-raasepori.digitransit.fi/kissa');
testProxying('next-dev-raasepori.digitransit.fi','/','digitransit-ui-waltti-v3:8080', true);
testRedirect('bosse.digitransit.fi','/kissa','https://bosse.digitransit.fi/kissa');
testProxying('bosse.digitransit.fi','/','digitransit-ui-waltti-v3:8080', true);

it('https should not redirect', function(done) {
httpsGet('turku.digitransit.fi','/kissa').end((err,res)=>{
expect(err).to.be.null;
Expand Down

0 comments on commit 23e7ee6

Please sign in to comment.