From 945f0874d89a8c47e09f0c9d2056ac4c52eae9ab Mon Sep 17 00:00:00 2001
From: Makhtar DIAGNE <makhtar.diagne@teamdlab.com>
Date: Wed, 27 May 2020 20:05:23 +0200
Subject: [PATCH] [TECH] Fix recette configuration
---
.../config/cas-server-application-recette.yml | 15 +++++++--------
.../config/ui-identity-application-recette.yml | 12 ++++++------
.../main/config/ui-portal-application-recette.yml | 12 ++++++------
3 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/cas/cas-server/src/main/config/cas-server-application-recette.yml b/cas/cas-server/src/main/config/cas-server-application-recette.yml
index fc372d2d..9a3fb093 100644
--- a/cas/cas-server/src/main/config/cas-server-application-recette.yml
+++ b/cas/cas-server/src/main/config/cas-server-application-recette.yml
@@ -9,7 +9,7 @@ spring:
server:
ssl:
- key-store: file:src/main/config/cas-server.jks
+ key-store: file:src/main/config/keystore_cas-server.jks
key-store-password: changeme
key-password: changeme
host: dev.vitamui.com
@@ -18,7 +18,7 @@ server:
context-path: /cas
-vitamui.cas.tenant.identifier: 11
+vitamui.cas.tenant.identifier: -1
vitamui.cas.identity: cas
iam-client:
server-host: localhost
@@ -39,7 +39,6 @@ cas.authn.accept.users:
cas.messageBundle.baseNames: classpath:overriden_messages,classpath:messages
-cas.messageBundle.commonNames: classpath:/common_messages.properties
cas.tgc.path: /cas
@@ -48,7 +47,7 @@ cas.tgc.crypto.enabled: false
cas.webflow.crypto.enabled: true
cas.authn.pm.reset.crypto.enabled: true
-cas.server.prefix: https://dev.vitamui.com/cas
+cas.server.prefix: https://dev.vitamui.com:8080/cas
login.url: ${cas.server.prefix}/login
cas.serviceRegistry.mongo.clientUri: mongodb://mongod_dbuser_cas:mongod_dbpwd_cas@localhost:27018/cas
@@ -80,7 +79,6 @@ cas.authn.pm.reset.mail.attributeName: email
cas.authn.pm.reset.securityQuestionsEnabled: false
cas.authn.pm.reset.includeServerIpAddress: false
cas.authn.pm.autoLogin: true
-cas.authn.mfa.simple.mail.text: xxx
cas.authn.mfa.simple.sms.from: '+33644602712'
@@ -90,6 +88,7 @@ cas.authn.mfa.simple.timeToKillInSeconds: 3600
cas.authn.mfa.simple.tokenLength: 4
cas.authn.mfa.globalPrincipalAttributeNameTriggers: computedOtp
cas.authn.mfa.globalPrincipalAttributeValueRegex: 'true'
+cas.authn.mfa.simple.mail.text: xxx
spring.mail.host: localhost
@@ -97,8 +96,8 @@ spring.mail.port: 2525
spring.mail.username: no-reply@vitamui.com
spring.mail.password: password
spring.mail.testConnection: false
-spring.mail.properties.mail.smtp.auth: true
-spring.mail.properties.mail.smtp.starttls.enable: true
+spring.mail.properties.mail.smtp.auth: false
+spring.mail.properties.mail.smtp.starttls.enable: false
cas.authn.throttle.failure.threshold: 2
@@ -121,7 +120,7 @@ cas.smsProvider.twilio.accountId: AC3942c2fee9478d0295b3051735860e3b
cas.smsProvider.twilio.token: 982e4b1cffaaaac491305d984d43df9f
-vitamui.portal.url: https://dev.vitamui.com/
+vitamui.portal.url: https://dev.vitamui.com:9000/
token.api.cas: tokcas_ie6UZsEcHIWrfv2x
diff --git a/ui/ui-identity/src/main/config/ui-identity-application-recette.yml b/ui/ui-identity/src/main/config/ui-identity-application-recette.yml
index 6f204019..99c76e19 100644
--- a/ui/ui-identity/src/main/config/ui-identity-application-recette.yml
+++ b/ui/ui-identity/src/main/config/ui-identity-application-recette.yml
@@ -29,9 +29,9 @@ ui-identity:
key-password: changeme
hostname-verification: false
base-url:
- portal: "https://dev.vitamui.com"
- admin-identity: "https://dev.vitamui.com/identity"
- identity: "https://dev.vitamui.com/identity"
+ portal: "https://dev.vitamui.com:9000"
+ admin-identity: "https://dev.vitamui.com/:9001identity"
+ identity: "https://dev.vitamui.com:9001/identity"
server:
host: dev.vitamui.com
@@ -52,12 +52,12 @@ management:
enabled: false
ui:
- url: "https://dev.vitamui.com/identity"
- redirect-url: ${ui.url}
+ url: "https://dev.vitamui.com:9001/identity"
+ redirect-url: ${ui.url}/${ui-prefix}
cas:
internal-url: https://dev.vitamui.com:8080/cas
- external-url: https://dev.vitamui.com/cas
+ external-url: https://dev.vitamui.com:8080/cas
callback-url: ${ui.url}/identity-api/callback
ssl:
trust-store: src/main/config/truststore_server.jks
diff --git a/ui/ui-portal/src/main/config/ui-portal-application-recette.yml b/ui/ui-portal/src/main/config/ui-portal-application-recette.yml
index 447dae3b..f0abacc1 100644
--- a/ui/ui-portal/src/main/config/ui-portal-application-recette.yml
+++ b/ui/ui-portal/src/main/config/ui-portal-application-recette.yml
@@ -14,7 +14,7 @@ server:
port: 9000
scheme: https
ssl:
- key-store: src/main/config/ui-portal.jks
+ key-store: src/main/config/keystore_ui-portal.jks
key-store-password: changeme
key-password: changeme
management:
@@ -44,17 +44,17 @@ ui-portal:
key-password: changeme
hostname-verification: false
base-url:
- portal: "https://dev.vitamui.com"
- admin-identity: "https://dev.vitamui.com/identity"
- identity: "https://dev.vitamui.com/identity"
+ portal: "https://dev.vitamui.com:9000"
+ admin-identity: "https://dev.vitamui.com:9001/identity"
+ identity: "https://dev.vitamui.com:9001/identity"
ui:
- url: "https://dev.vitamui.com"
+ url: "https://dev.vitamui.com:9000"
redirect-url: ${ui.url}
cas:
internal-url: https://dev.vitamui.com:8080/cas
- external-url: https://dev.vitamui.com/cas
+ external-url: https://dev.vitamui.com:8080/cas
callback-url: ${ui.url}/portal-api/callback
ssl:
trust-store: src/main/config/truststore_server.jks
--
GitLab