From 7b44fd6afadfed1904a0dfd42bb6f2fa5d5c80ff Mon Sep 17 00:00:00 2001
From: Makhtar DIAGNE <makhtar.diagne@teamdlab.com>
Date: Fri, 5 Jun 2020 11:05:10 +0200
Subject: [PATCH] [FIX RABB-579] Fix error sending mail from iam-internal
---
deployment/environments/group_vars/all/vitamui_vars.yml | 2 +-
.../roles/vitamui/templates/iam-internal/application.yml.j2 | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/deployment/environments/group_vars/all/vitamui_vars.yml b/deployment/environments/group_vars/all/vitamui_vars.yml
index 70e63424..67a7d837 100755
--- a/deployment/environments/group_vars/all/vitamui_vars.yml
+++ b/deployment/environments/group_vars/all/vitamui_vars.yml
@@ -167,7 +167,7 @@ vitamui:
logback_total_size_cap: "5GB"
root_log_level: "ERROR"
vitamui_level: "INFO"
- reset_password_url: /cas/extras/resetPassword?username={username}&firstname={firstname}&lastname={lastname}&language={language}&ttl=1day
+ reset_password_url: /extras/resetPassword?username={username}&firstname={firstname}&lastname={lastname}&language={language}&ttl=1day
security_internal:
host: "vitamui-security-internal.service.consul"
vitamui_component: "security-internal"
diff --git a/deployment/roles/vitamui/templates/iam-internal/application.yml.j2 b/deployment/roles/vitamui/templates/iam-internal/application.yml.j2
index 55e4be4a..e2d5d978 100644
--- a/deployment/roles/vitamui/templates/iam-internal/application.yml.j2
+++ b/deployment/roles/vitamui/templates/iam-internal/application.yml.j2
@@ -79,7 +79,11 @@ cas-client:
hostname-verification: false
{% endif %}
+{% if vitamui.cas_server.base_url is defined %}
cas.reset.password.url: {{ vitamui.cas_server.reset_password_url }}
+{% else %}
+cas.reset.password.url: /cas{{ vitamui.cas_server.reset_password_url }}
+{% endif %}
login.attempts.maximum.failures: {{ vitamui_struct.login_max_failure|default('5') }}
login.attempts.time.interval: {{ vitamui_struct.login_interval|default('20') }}
--
GitLab