From 5643dfc0398ebf3eaa33f48c2987eabe3ff0e3bc Mon Sep 17 00:00:00 2001
From: Julien Gomes Dias <abld@abld.info>
Date: Fri, 5 Nov 2021 20:14:31 +0000
Subject: [PATCH] =?UTF-8?q?Mettre=20=C3=A0=20jour=20roles/adm=5Finstance/t?=
 =?UTF-8?q?emplates/config.env.inc.j2,=20roles/adm=5Finstance/defaults/mai?=
 =?UTF-8?q?n.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 roles/adm_instance/defaults/main.yml           | 6 +++---
 roles/adm_instance/templates/config.env.inc.j2 | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/roles/adm_instance/defaults/main.yml b/roles/adm_instance/defaults/main.yml
index 38c97887..3e5ab80d 100644
--- a/roles/adm_instance/defaults/main.yml
+++ b/roles/adm_instance/defaults/main.yml
@@ -3,8 +3,8 @@
   # mail default parameters
   #
   mail_protocol: smtp
-  mail_secure: tls
-  mail_auth: true
+  mail_port: 465
+  mail_secure: PHPMailer::ENCRYPTION_SMTPS
   mail_host: ''
   mail_username: ''
   mail_password: ''
@@ -26,4 +26,4 @@
   mercanet_response_files: [
     'm_call_response.php', 
     'm_call_autoresponse.php'
-    ]
\ No newline at end of file
+    ]
diff --git a/roles/adm_instance/templates/config.env.inc.j2 b/roles/adm_instance/templates/config.env.inc.j2
index 09facd4b..944af8c5 100644
--- a/roles/adm_instance/templates/config.env.inc.j2
+++ b/roles/adm_instance/templates/config.env.inc.j2
@@ -3,9 +3,10 @@ $site_url = 'https://{{ app_domain }}';
 
 function setSendingParams($mail) {
   $mail->Mailer   = '{{ mail_protocol | default() }}';
-  $mail->SMTPSecure = '{{ mail_secure | default() }}';
+  $mail->SMTPSecure = {{ mail_secure | default() }};
   $mail->Host     = '{{ mail_host | default() }}';
-  $mail->SMTPAuth = {{ mail_auth | default() }};
+  $mail->SMTPAuth = true;
+  $mail->Port     = {{ mail_port | default() }};
   $mail->Username = '{{ mail_username | default() }}';
   $mail->Password = '{{ mail_password | default() }}';
 }
-- 
GitLab