From 157b3a69019c9af631c372ab793f553b122448aa Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Wed, 21 Dec 2022 18:04:11 +0100
Subject: [PATCH] [roundcube] Brushing up

---
 group_vars/roundcube.yml                              | 2 +-
 roles/roundcube/templates/roundcube/config.inc.php.j2 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/group_vars/roundcube.yml b/group_vars/roundcube.yml
index 7d7210ce..ab500802 100644
--- a/group_vars/roundcube.yml
+++ b/group_vars/roundcube.yml
@@ -2,7 +2,7 @@
 glob_roundcube:
   name: Crans
   imap_server: owl.adm.crans.org
-  smtp_server: smtp.adm.crans.org
+  smtp_server: tls://smtp.adm.crans.org
   pgsql_server: pgsql.adm.crans.org
   mail_domain: crans.org
   des_key: "{{ vault.roundcube.des_key }}"
diff --git a/roles/roundcube/templates/roundcube/config.inc.php.j2 b/roles/roundcube/templates/roundcube/config.inc.php.j2
index 5336f508..37332dd5 100644
--- a/roles/roundcube/templates/roundcube/config.inc.php.j2
+++ b/roles/roundcube/templates/roundcube/config.inc.php.j2
@@ -51,7 +51,7 @@ $config['default_host'] = array(
 $config['smtp_server'] = '{{ roundcube.smtp_server }}';
 
 // SMTP port. Use 25 for cleartext, 465 for Implicit TLS, or 587 for STARTTLS (default)
-$config['smtp_port'] = 25;
+$config['smtp_port'] = 587;
 
 // SMTP username (if required) if you use %u as the username Roundcube
 // will use the current username for login
@@ -59,7 +59,7 @@ $config['smtp_user'] = '%u';
 
 // SMTP password (if required) if you use %p as the password Roundcube
 // will use the current user's password for login
-$config['smtp_pass'] = '';
+$config['smtp_pass'] = '%p';
 
 // provide an URL where a user can get support for this Roundcube installation
 // PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!