From 1b5cad5e36296d9eabf9832e1df780210163e20e Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati Date: Fri, 22 Jun 2018 10:05:00 +0200 Subject: [PATCH] TSK-536: taskana-rest-example redirect http -> https --- .../src/main/resources/application.properties | 3 +++ .../environments/data-sources/environment-information.json | 2 +- web/src/environments/environment.prod.ts | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rest/taskana-rest-spring-example/src/main/resources/application.properties b/rest/taskana-rest-spring-example/src/main/resources/application.properties index 0823434b2..133e06635 100644 --- a/rest/taskana-rest-spring-example/src/main/resources/application.properties +++ b/rest/taskana-rest-spring-example/src/main/resources/application.properties @@ -30,3 +30,6 @@ taskana.ldap.maxNumberOfReturnedAccessIds=50 taskana.jobscheduler.cron=0 * * * * * ####### cache static resources properties spring.resources.cache.cachecontrol.cache-private=true +####### tomcat is not detecting the x-forward headers from bluemix as a trustworthy proxy +server.tomcat.internal-proxies=.* +server.use-forward-headers=true diff --git a/rest/taskana-rest-spring-example/src/main/resources/static/environments/data-sources/environment-information.json b/rest/taskana-rest-spring-example/src/main/resources/static/environments/data-sources/environment-information.json index dfb727b53..7b85c397c 100644 --- a/rest/taskana-rest-spring-example/src/main/resources/static/environments/data-sources/environment-information.json +++ b/rest/taskana-rest-spring-example/src/main/resources/static/environments/data-sources/environment-information.json @@ -1,3 +1,3 @@ { - "taskanaRestUrl": "https://taskana-rest.mybluemix.net" + "taskanaRestUrl": "https://taskana.mybluemix.net" } diff --git a/web/src/environments/environment.prod.ts b/web/src/environments/environment.prod.ts index 6659e7c0d..f68e6bc82 100644 --- a/web/src/environments/environment.prod.ts +++ b/web/src/environments/environment.prod.ts @@ -1,4 +1,4 @@ export const environment = { production: true, - taskanaRestUrl: 'https://taskana-rest.mybluemix.net' + taskanaRestUrl: 'https://taskana.mybluemix.net' };