diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2014-01-14 06:47:11 +0100 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2015-06-07 02:51:34 +0200 |
| commit | 8aff225c82bc8c6e099d5370a14bc289c438703a (patch) | |
| tree | 5137940bb746e333c02ab0f6892692ee61fca628 | |
| parent | 0853c2afdc2ddba11692ef17bb859104d47071e0 (diff) | |
typo
| -rw-r--r-- | roles/IMAP/tasks/mda.yml | 2 | ||||
| -rw-r--r-- | roles/IMAP/templates/etc/amavis/conf.d/50-user.j2 | 2 | ||||
| -rw-r--r-- | roles/MSA/templates/etc/postfix/main.cf.j2 | 2 | ||||
| -rw-r--r-- | roles/MX/templates/etc/postfix/main.cf.j2 | 2 | ||||
| -rw-r--r-- | roles/common/templates/etc/postfix/main.cf.j2 | 2 | ||||
| -rw-r--r-- | roles/webmail/templates/etc/postfix/main.cf.j2 | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/roles/IMAP/tasks/mda.yml b/roles/IMAP/tasks/mda.yml index 0d41669..cef40a0 100644 --- a/roles/IMAP/tasks/mda.yml +++ b/roles/IMAP/tasks/mda.yml @@ -19,7 +19,7 @@ owner=root group=root mode=0755 -- name: Copy lookups tables +- name: Copy lookup tables copy: src=etc/postfix/virtual/{{ item }} dest=/etc/postfix-{{ postfix_instance[inst].name }}/virtual/{{ item }} owner=root group=root diff --git a/roles/IMAP/templates/etc/amavis/conf.d/50-user.j2 b/roles/IMAP/templates/etc/amavis/conf.d/50-user.j2 index 7d412f8..00a82ce 100644 --- a/roles/IMAP/templates/etc/amavis/conf.d/50-user.j2 +++ b/roles/IMAP/templates/etc/amavis/conf.d/50-user.j2 @@ -113,7 +113,7 @@ $interface_policy{'10041'} = 'INBOUND'; {% if 'MTA-out' in group_names %} $notify_method = 'smtp:[127.0.0.1]:{{ MTA_out.port }}'; {% else %} -$notify_method = 'smtp:[{{ MTA_out.IPv4 }}]:{{ MTA_out.port }}'; +$notify_method = 'smtp:[{{ MTA_out.host }}]:{{ MTA_out.port }}'; {% endif %} $forward_method = 'lmtp:/var/run/dovecot/lmtp'; $requeue_method = $forward_method; diff --git a/roles/MSA/templates/etc/postfix/main.cf.j2 b/roles/MSA/templates/etc/postfix/main.cf.j2 index 42b9aca..685287a 100644 --- a/roles/MSA/templates/etc/postfix/main.cf.j2 +++ b/roles/MSA/templates/etc/postfix/main.cf.j2 @@ -45,7 +45,7 @@ recipient_delimiter = + {% if 'MTA-out' in group_names %} relayhost = [127.0.0.1]:{{ MTA_out.port }} {% else %} -relayhost = [{{ MTA_out.IPv4 }}]:{{ MTA_out.port }} +relayhost = [{{ MTA_out.host }}]:{{ MTA_out.port }} {% endif %} relay_domains = diff --git a/roles/MX/templates/etc/postfix/main.cf.j2 b/roles/MX/templates/etc/postfix/main.cf.j2 index c0da5e7..570a797 100644 --- a/roles/MX/templates/etc/postfix/main.cf.j2 +++ b/roles/MX/templates/etc/postfix/main.cf.j2 @@ -46,7 +46,7 @@ recipient_delimiter = + {% if 'MTA-out' in group_names %} relayhost = [127.0.0.1]:{{ MTA_out.port }} {% else %} -relayhost = [{{ MTA_out.IPv4 }}]:{{ MTA_out.port }} +relayhost = [{{ MTA_out.host }}]:{{ MTA_out.port }} {% endif %} relay_domains = diff --git a/roles/common/templates/etc/postfix/main.cf.j2 b/roles/common/templates/etc/postfix/main.cf.j2 index 10d4244..5728986 100644 --- a/roles/common/templates/etc/postfix/main.cf.j2 +++ b/roles/common/templates/etc/postfix/main.cf.j2 @@ -37,7 +37,7 @@ smtp_generic_maps = pcre:$config_directory/generic.pcre {% if 'MTA-out' in group_names %} relayhost = [127.0.0.1]:{{ MTA_out.port }} {% else %} -relayhost = [{{ MTA_out.IPv4 }}]:{{ MTA_out.port }} +relayhost = [{{ MTA_out.host }}]:{{ MTA_out.port }} {% endif %} relay_domains = diff --git a/roles/webmail/templates/etc/postfix/main.cf.j2 b/roles/webmail/templates/etc/postfix/main.cf.j2 index fd4ea8e..e9a2e7d 100644 --- a/roles/webmail/templates/etc/postfix/main.cf.j2 +++ b/roles/webmail/templates/etc/postfix/main.cf.j2 @@ -45,7 +45,7 @@ recipient_delimiter = + {% if 'MTA-out' in group_names %} relayhost = [127.0.0.1]:{{ MTA_out.port }} {% else %} -relayhost = [{{ MTA_out.IPv4 }}]:{{ MTA_out.port }} +relayhost = [{{ MTA_out.host }}]:{{ MTA_out.port }} {% endif %} relay_domains = |