From ebc21b5659fe8af0c7b11af851cdc1a1770e9678 Mon Sep 17 00:00:00 2001 From: genofire Date: Sat, 25 Jul 2020 11:53:36 +0200 Subject: [PATCH] roundcube: fix by using hostdomain --- defaults/main.yml | 3 ++- templates/roundcubemail-conf.php | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 26a927c..3b967dd 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,8 @@ --- mailserver_mail_domain: "sum7.eu" +mailserver_mail_hostdomain: "mail.{{mailserver_mail_domain}}" mailserver_mx_domain: "{{ inventory_hostname }}" -mailserver_cert_domains: "{{ mailserver_mx_domain }} mail.{{ mailserver_mail_domain }}" +mailserver_cert_domains: "{{ mailserver_mx_domain }} {{ mailserver_mail_hostdomain }}" mailserver_dovecot_enabled: true # would not install postfixadmn either diff --git a/templates/roundcubemail-conf.php b/templates/roundcubemail-conf.php index 8246d1b..91d0da2 100644 --- a/templates/roundcubemail-conf.php +++ b/templates/roundcubemail-conf.php @@ -37,7 +37,7 @@ $config['db_dsnw'] = '{{ mailserver_roundcubemail_db_type }}://{{ mailserver_rou // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %s - domain name after the '@' from e-mail address provided at login screen // For example %n = mail.domain.tld, %t = domain.tld -$config['default_host'] = 'ssl://{{ mailserver_mx_domain }}'; +$config['default_host'] = 'ssl://{{ mailserver_mail_hostdomain }}'; // SMTP server host (for sending mails). // To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// @@ -49,7 +49,7 @@ $config['default_host'] = 'ssl://{{ mailserver_mx_domain }}'; // %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://{{ mailserver_mx_domain }}'; +$config['smtp_server'] = 'tls://{{ mailserver_mail_hostdomain }}'; // SMTP port (default is 25; use 587 for STARTTLS or 465 for the // deprecated SSL over SMTP (aka SMTPS)) @@ -75,7 +75,7 @@ $config['product_name'] = 'Webmail'; // in the session record (and the client cookie if remember password is enabled). // please provide a string of exactly 24 chars. // YOUR KEY MUST BE DIFFERENT THAN THE SAMPLE VALUE FOR SECURITY REASONS -$//config['des_key'] = 'oaV96vtQ6simuPuDgpABGKF7'; +//$config['des_key'] = 'oaV96vtQ6simuPuDgpABGKF7'; // List of active plugins (in plugins/ directory) $config['plugins'] = array(