typo

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
@@ -2,35 +2,35 @@
   apt: pkg={{ item }}
   with_items:
     - postfix
     - postfix-ldap
 
 - name: Configure Postfix
   template: src=etc/postfix/main.cf.j2
             dest=/etc/postfix-{{ postfix_instance[inst].name }}/main.cf
             owner=root group=root
             mode=0644
   register: r
   notify:
     - Restart Postfix
 
 - name: Create directory /etc/postfix-.../virtual
   file: path=/etc/postfix-{{ postfix_instance[inst].name }}/virtual
         state=directory
         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
         mode=0644
   with_items:
     - mailbox_domains.cf
     - mailbox_maps.cf
     - transport_content_filter_maps.cf
 
 - name: Start Postfix
   service: name=postfix state=started
   when: not r.changed
 
 - meta: flush_handlers
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
@@ -96,40 +96,40 @@ $default_ldap = {
 
 $recipient_delimiter = '+';
 $enable_dkim_verification = 1;    # enable DKIM signatures verification
 
 
 # Per-recipient Bayes Database.
 @sa_username_maps = (
   new_RE ( [ qr'^(.+@[^@]+)$'i => '$1' ] ),
   'amavis' # catch-all
 );
 
 # http://www.ijs.si/software/amavisd/amavisd-new-docs.html#pbanks-ex
 
 $inet_socket_port = 10041;
 
 $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;
 
 $sa_tag_level_deflt         = undef;
 $sa_tag2_level_deflt        = 5;
 $sa_kill_level_deflt        = 5;
 $sa_dsn_cutoff_level        = undef;
 $sa_quarantine_cutoff_level = undef;
 
 $policy_bank{'INBOUND'} = {
   originating           => 0,  # indicates a remote client, allows checking
   smtpd_greeting_banner =>
     '${helo-name} ${protocol} ${product} INBOUND service ready',
   mynetworks_maps       => [],  # avoids loading MYNETS policy unnecessarily
 };
 
 #------------ Do not modify anything below this line -------------
 1;  # ensure a defined return
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
@@ -28,41 +28,41 @@ multi_instance_enable = yes
 
 # This server is a Mail Submission Agent
 mynetworks_style = host
 inet_interfaces  = all
 inet_protocols   = all
 
 # No local delivery
 mydestination        =
 local_transport      = error:5.1.1 Mailbox unavailable
 alias_maps           =
 alias_database       =
 local_recipient_maps =
 
 message_size_limit  = 67108864
 recipient_delimiter = +
 
 # Forward everything to our internal mailhub
 {% 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 =
 
 # Don't rewrite remote headers
 local_header_rewrite_clients     =
 # Pass the client information along to the content filter
 smtp_send_xforward_command       = yes
 # Avoid splitting the envelope and scanning messages multiple times
 smtp_destination_recipient_limit = 1000
 # Tolerate occasional high latency
 smtp_data_done_timeout           = 1200s
 
 # Anonymize the (authenticated) sender; pass the mail to the antivirus
 header_checks  = pcre:$config_directory/anonymize_sender.pcre
 #content_filter = amavisfeed:unix:public/amavisfeed-antivirus
 
 # Tunnel everything through IPSec
 smtp_tls_security_level = none
 smtp_bind_address       = 172.16.0.1
 
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
@@ -29,41 +29,41 @@ multi_instance_enable = yes
 
 # This server is a Mail eXchange
 mynetworks_style = host
 inet_interfaces  = all
 inet_protocols   = all
 
 # No local delivery
 mydestination        =
 local_transport      = error:5.1.1 Mailbox unavailable
 alias_maps           =
 alias_database       =
 local_recipient_maps =
 
 message_size_limit  = 67108864
 recipient_delimiter = +
 
 # Forward everything to our internal mailhub
 {% 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 =
 
 # Virtual transport
 {% if 'LDA' in group_names %}
 virtual_transport = smtpl:[127.0.0.1]:{{ LDA.port }}
 {% else %}
 virtual_transport = smtps:[{{ LDA.host }}]:{{ LDA.port }}
 {% endif %}
 # It's a bit stupid to include part of the virtual_mailbox_maps here,
 # but we need to tell postfix to accept the recipient
 # (virtual_mailbox_maps) *before* sending away to the right machine
 # (transport_maps)
 transport_maps = pcre:$config_directory/virtual/transport_reserved_maps.pcre
                  ldap:$config_directory/virtual/transport_mailbox_maps.cf
                  ldap:$config_directory/virtual/transport_lists_maps.cf
                  ldap:$config_directory/virtual/transport_catchall_maps.cf
 
 virtual_mailbox_domains = ldap:$config_directory/virtual/mailbox_domains.cf
 virtual_alias_maps      = cdb:$config_directory/virtual/reserved_alias_maps
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
@@ -20,41 +20,41 @@ inet_interfaces  = loopback-only
 inet_protocols   = ipv4
 
 # No local delivery
 mydestination        =
 local_transport      = error:5.1.1 Mailbox unavailable
 alias_maps           =
 local_recipient_maps =
 
 # All aliases are virtual
 default_database_type = cdb
 virtual_alias_maps    = cdb:/etc/aliases
 alias_database        = $virtual_alias_maps
 
 # Transform local FQDN addresses to addresses routable on the internet
 smtp_generic_maps = pcre:$config_directory/generic.pcre
 
 # Forward everything to our internal mailhub
 {% 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 =
 
 # Tunnel everything through IPSec
 smtp_tls_security_level  = none
 smtp_bind_address        = 172.16.0.1
 smtpd_tls_security_level = none
 
 # Turn off all TCP/IP listener ports except that dedicated to
 # samhain(8), which sadly cannot use pickup through the sendmail binary.
 master_service_disable = !16132.inet inet
 
 {% set multi_instance = False %}
 {%- for g in postfix_instance.keys() | sort -%}
   {%- if g in group_names -%}
     {%- if not multi_instance -%}
       {%- set multi_instance = True -%}
 ## Other postfix instances
 multi_instance_wrapper     = $command_directory/postmulti -p --
 multi_instance_enable      = yes
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
@@ -28,41 +28,41 @@ multi_instance_enable = yes
 
 # This server is a nullclient 
 mynetworks_style = host
 inet_interfaces  = loopback-only
 inet_protocols   = all
 
 # No local delivery
 mydestination        =
 local_transport      = error:5.1.1 Mailbox unavailable
 alias_maps           =
 alias_database       =
 local_recipient_maps =
 
 message_size_limit  = 67108864
 recipient_delimiter = +
 
 # Forward everything to our internal mailhub
 {% 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 =
 
 # Don't rewrite remote headers
 local_header_rewrite_clients     =
 # Pass the client information along to the content filter
 smtp_send_xforward_command       = yes
 # Avoid splitting the envelope and scanning messages multiple times
 smtp_destination_recipient_limit = 1000
 # Tolerate occasional high latency
 smtp_data_done_timeout           = 1200s
 
 # Pass the mail to the antivirus
 #content_filter = amavisfeed:unix:public/amavisfeed-antivirus
 
 # Tunnel everything through IPSec
 smtp_tls_security_level  = none
 smtp_bind_address        = 172.16.0.1
 smtpd_tls_security_level = none