From 5f554c8bbdb8d96fd30591a930efb708dbb859da Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Mon, 6 Mar 2023 22:57:13 +0100
Subject: [PATCH] install_roundcube.sh: replace 'smtp_server' with 'smtp_host'
 in configuration file.

---
 install_roundcube.sh | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/install_roundcube.sh b/install_roundcube.sh
index f4b0894..4e02899 100755
--- a/install_roundcube.sh
+++ b/install_roundcube.sh
@@ -1856,8 +1856,7 @@ info "Now browse to the intaller site and continue installation.\n$(cat <<EOF
       junk_mbox..............: $SPAM_FOLDER_NAME
 
    SMTP Settings:
-      smtp_server............: tls://$(hostname -f)
-      smtp_port..............: 587
+      smtp_host..............: tls://$(hostname -f):587
 
       smtp_user/smtp_pass....: 
          [x] Use the current IMAP username and password for SMTP authentication
@@ -1972,9 +1971,10 @@ cat <<EOF >>$WEBSITE_BASEDIR/roundcubemail-${ROUNDCUBE_VERSION}/config/config.in
 // SMTP
 // ----------------------------------
 
-// SMTP server host (for sending mails).
-// Enter hostname with prefix tls:// to use STARTTLS, or use
-// prefix ssl:// to use the deprecated SSL over SMTP (aka SMTPS)
+// SMTP server host (and optional port number) for sending mails.
+// Enter hostname with prefix ssl:// to use Implicit TLS, or use
+// prefix tls:// to use STARTTLS.
+// If port number is omitted it will be set to 465 (for ssl://) or 587 otherwise.
 // Supported replacement variables:
 // %h - user's IMAP hostname
 // %n - hostname (\$_SERVER['SERVER_NAME'])
@@ -1982,11 +1982,9 @@ cat <<EOF >>$WEBSITE_BASEDIR/roundcubemail-${ROUNDCUBE_VERSION}/config/config.in
 // %d - domain (http hostname \$_SERVER['HTTP_HOST'] without the first part)
 // %z - IMAP domain (IMAP hostname without the first part)
 // For example %n = mail.domain.tld, %t = domain.tld
-\$config['smtp_server'] = 'tls://$(hostname -f)';
-
-// SMTP port (default is 25; use 587 for STARTTLS or 465 for the
-// deprecated SSL over SMTP (aka SMTPS))
-\$config['smtp_port'] = 587;
+// To specify different SMTP servers for different IMAP hosts provide an array
+// of IMAP host (no prefix or port) and SMTP server e.g. ['imap.example.com' => 'smtp.example.net']
+\$config['smtp_host'] = 'tls://$(hostname -f):587';
 
 // SMTP username (if required) if you use %u as the username Roundcube
 // will use the current username for login