Skip to content

Commit 917ef23

Browse files
committed
Remove unused waltti-test auth configurations.
1 parent ef56133 commit 917ef23

4 files changed

Lines changed: 2 additions & 7 deletions

File tree

nginx.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -729,8 +729,6 @@ http {
729729
location / {
730730
proxy_pass http://digitransit-ui-waltti-test:8080;
731731
include basicsettings.conf;
732-
# auth_basic "waltti-test.digitransit.fi";
733-
# auth_basic_user_file .htpasswd;
734732
}
735733
}
736734

run.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ sed -i "s#CDN_BASE_URL#${CDN_BASE_URL}#" /etc/nginx/common.conf
3434
sed -i "s/MOBILITY_API_KEY/${MOBILITY_API_KEY}/" /etc/nginx/external.conf
3535

3636
#set basic auth
37-
htpasswd -c -B -b .htpasswd $WALTTI_TEST_CREDENTIALS_USER $WALTTI_TEST_CREDENTIALS_PASS &>/dev/null
38-
htpasswd -B -b .htpasswd $DEBUG_UI_CREDENTIALS_USER $DEBUG_UI_CREDENTIALS_PASS &>/dev/null
37+
htpasswd -c -B -b .htpasswd $DEBUG_UI_CREDENTIALS_USER $DEBUG_UI_CREDENTIALS_PASS &>/dev/null
3938

4039
#start nginx
4140
nginx

test.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,6 @@ describe('ext-proxy', function() {
329329
});
330330

331331
describe('waltti-test ui', function() {
332-
// testCallingWithoutCredentials('waltti-test.digitransit.fi','/kissa','https://waltti-test.digitransit.fi/kissa');
333-
// testWithCorrectCredentials('waltti-test.digitransit.fi','/kissa', 'test', 'test', 'https://waltti-test.digitransit.fi/kissa', true);
334332
testRedirect('waltti-test.digitransit.fi','/kissa','https://waltti-test.digitransit.fi/kissa');
335333
testProxying('waltti-test.digitransit.fi','/','digitransit-ui-waltti-test:8080', true);
336334
});

test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CONTAINER_ID=$(docker run -d -p 9000:8080 $ADDHOSTS -e VILKKU_BASIC_AUTH="\"test
2525
-e GIRAVOLTA_VANTAA_AUTH="\"test\"" -e VARELY_BASIC_AUTH="\"test\"" -e VARELY_RT_BASIC_AUTH="\"test\"" \
2626
-e RAUMA_RT_BASIC_AUTH="\"test\"" -e RAUMA_STATIC_BASIC_AUTH="\"test\"" \
2727
-e PORI_RT_BASIC_AUTH="\"test\"" -e MH_BASIC_AUTH="\"test\"" -e RAASEPORI_RT_BASIC_AUTH="\"test\"" \
28-
-e WALTTI_TEST_CREDENTIALS_USER="test" -e WALTTI_TEST_CREDENTIALS_PASS="test" -e WALTTI_TEST_STATIC_BASIC_AUTH="\"test\"" \
28+
-e WALTTI_TEST_STATIC_BASIC_AUTH="\"test\"" \
2929
-e DEBUG_UI_CREDENTIALS_USER="test" -e DEBUG_UI_CREDENTIALS_PASS="test" \
3030
-e MOBILITY_API_KEY="\"test\"" -e CDN_BASE_URL="test" \
3131
hsldevcom/digitransit-proxy:integrationtest)

0 commit comments

Comments
 (0)