diff --git a/roles/adm_instance/defaults/main.yml b/roles/adm_instance/defaults/main.yml index 38c978876978d3be4b32af099df34ac9935d1702..3e5ab80d723807a4b6a829aa0950c88c1fdd1c7b 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 09facd4bd983db8fe141777640bce8ca4ff5583b..944af8c578c5073db34e820fb5b8f307e1d72cfd 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() }}'; }