From 3974acda052ea1cd9fabf4c262a72f71ea599d5d Mon Sep 17 00:00:00 2001 From: Dmitry Toptygin Date: Thu, 7 May 2020 17:33:01 -0400 Subject: [PATCH] use ssl_with_client_cert_and_webtoken_auth config with AllCloudInOneServer process --- .../src/main/resources/application.properties | 9 ++++++--- portal-process/src/main/resources/application.properties | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/all-cloud-in-one-process/src/main/resources/application.properties b/all-cloud-in-one-process/src/main/resources/application.properties index 22e73d0d..0dcf78e0 100644 --- a/all-cloud-in-one-process/src/main/resources/application.properties +++ b/all-cloud-in-one-process/src/main/resources/application.properties @@ -12,11 +12,14 @@ app.name=AllCloudInOneServer #spring.profiles.include=use_ssl,http_basic_auth,use_single_ds,rest-template-single-user-per-service-digest-auth #spring.profiles.include=use_ssl,client_certificate_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth #spring.profiles.include=use_ssl_with_client_cert_and_basic_auth,client_certificate_and_basic_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth -spring.profiles.include=use_ssl,use_webtoken_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth +#spring.profiles.include=use_ssl,webtoken_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth +spring.profiles.include=use_ssl_with_client_cert_and_webtoken_auth,client_certificate_and_webtoken_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth spring.main.show-banner=false -server.port=9091 -tip.wlan.secondaryPort=9092 +# primary port uses client-certificate auth +server.port=9092 +#secondary port uses webtoken auth +tip.wlan.secondaryPort=9091 tip.wlan.introspectTokenApi.host=localhost:9091 tip.wlan.introspectTokenApi.clientToken=token_placeholder diff --git a/portal-process/src/main/resources/application.properties b/portal-process/src/main/resources/application.properties index 43624f37..4efed41a 100644 --- a/portal-process/src/main/resources/application.properties +++ b/portal-process/src/main/resources/application.properties @@ -11,7 +11,7 @@ app.name=PortalServer # Note: this property is additive, its value is always added to the list of active profiles #spring.profiles.include=use_ssl,http_basic_auth,use_single_ds,rest-template-single-user-per-service-digest-auth #spring.profiles.include=use_ssl,client_certificate_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth -spring.profiles.include=use_ssl,use_webtoken_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth +spring.profiles.include=use_ssl,webtoken_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth spring.main.show-banner=false server.port=9051