summaryrefslogtreecommitdiffstats
path: root/roles/webmail
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2014-06-25 02:37:48 +0200
committerGuilhem Moulin <guilhem@fripost.org>2015-06-07 02:51:48 +0200
commit2a2333cdfb016bb884887f46fbcbfdce6e064d74 (patch)
treee85d7c802436e3c5615ee8eef2ca9c68cd5eb895 /roles/webmail
parente9e8ce2add2b7c020daa02228e506e7c02828c15 (diff)
Assume a DNS entry for each role.
E.g., ldap.fripost.org, ntp.fripost.org, etc. (Ideally the DNS zone would be provisioned by ansible, too.) It's a bit unclear how to index the subdomains (mx{1,2,3}, etc), though.
Diffstat (limited to 'roles/webmail')
-rw-r--r--roles/webmail/templates/etc/postfix/main.cf.j26
-rw-r--r--roles/webmail/templates/usr/share/roundcube/plugins/managesieve/config.inc.php.j22
-rw-r--r--roles/webmail/templates/usr/share/roundcube/plugins/password/config.inc.php.j22
3 files changed, 5 insertions, 5 deletions
diff --git a/roles/webmail/templates/etc/postfix/main.cf.j2 b/roles/webmail/templates/etc/postfix/main.cf.j2
index 2ee2849..5d678a1 100644
--- a/roles/webmail/templates/etc/postfix/main.cf.j2
+++ b/roles/webmail/templates/etc/postfix/main.cf.j2
@@ -14,7 +14,7 @@ maximal_queue_lifetime = 5d
myorigin = /etc/mailname
myhostname = webmail{{ webmailno | default('') }}.$mydomain
-mydomain = {{ ansible_domain }}
+mydomain = fripost.org
append_dot_mydomain = no
# Turn off all TCP/IP listener ports except that necessary for the webmail.
@@ -43,9 +43,9 @@ recipient_delimiter = +
# Forward everything to our internal mailhub
{% if 'MTA-out' in group_names %}
-relayhost = [127.0.0.1]:{{ MTA_out.port }}
+relayhost = [127.0.0.1]:{{ postfix_instance["MTA-out"].port }}
{% else %}
-relayhost = [{{ MTA_out.host }}]:{{ MTA_out.port }}
+relayhost = [outgoing.fripost.org]:{{ postfix_instance["MTA-out"].port }}
{% endif %}
relay_domains =
diff --git a/roles/webmail/templates/usr/share/roundcube/plugins/managesieve/config.inc.php.j2 b/roles/webmail/templates/usr/share/roundcube/plugins/managesieve/config.inc.php.j2
index 27b5b44..c716ddc 100644
--- a/roles/webmail/templates/usr/share/roundcube/plugins/managesieve/config.inc.php.j2
+++ b/roles/webmail/templates/usr/share/roundcube/plugins/managesieve/config.inc.php.j2
@@ -9,7 +9,7 @@ $rcmail_config['managesieve_port'] = 4190;
// %n - http hostname ($_SERVER['SERVER_NAME'])
// %d - domain (http hostname without the first part)
// For example %n = mail.domain.tld, %d = domain.tld
-$rcmail_config['managesieve_host'] = '{{ IMAP }}';
+$rcmail_config['managesieve_host'] = 'imap.fripost.org';
// authentication method. Can be CRAM-MD5, DIGEST-MD5, PLAIN, LOGIN, EXTERNAL
// or none. Optional, defaults to best method supported by server.
diff --git a/roles/webmail/templates/usr/share/roundcube/plugins/password/config.inc.php.j2 b/roles/webmail/templates/usr/share/roundcube/plugins/password/config.inc.php.j2
index 35c73f9..a661909 100644
--- a/roles/webmail/templates/usr/share/roundcube/plugins/password/config.inc.php.j2
+++ b/roles/webmail/templates/usr/share/roundcube/plugins/password/config.inc.php.j2
@@ -28,7 +28,7 @@ $rcmail_config['password_log'] = false;
// You can provide one or several hosts in an array in which case the hosts are tried from left to right.
// Exemple: array('ldap1.exemple.com', 'ldap2.exemple.com');
// Default: 'localhost'
-$rcmail_config['password_ldap_host'] = '{{ LDAP_provider }}';
+$rcmail_config['password_ldap_host'] = 'ldap.fripost.org';
// LDAP server port to connect to
// Default: '389'