Merge remote-tracking branch 'upstream/master'

petemcw · Mar 16, 2017 · c414440 · c414440
2 parents c7e417a + e14147d
commit c414440
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 9 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -8,3 +8,5 @@ postfix_relayhost: ''
 postfix_use_smtp: false
 postfix_relayhost_user: false
 postfix_relayhost_pass: false
+postfix_inet_interfaces: loopback-only
+postfix_mynetworks: "127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128"
diff --git a/handlers/main.yml b/handlers/main.yml
@@ -1,6 +1,10 @@
 ---
 # Handlers for Postfix notifications.
 
+- name: postmap sasl
+  command: >
+    /usr/sbin/postmap {{ postfix_config_dir }}/sasl_passwd
+
 - name: stop postfix
   service: >
     name={{ postfix_service }}
@@ -18,11 +22,9 @@
     state=restarted
     enabled=yes
 
-- name: postmap sasl
-  command: >
-    /usr/sbin/postmap {{ postfix_config_dir }}/sasl_passwd
-
 - name: send test email
+  when: 
+    - postfix_notify_email and not false
+    - postfix_notify_email is defined
   shell: >
     echo "This is a test message from Ansible configuration of {{ ansible_hostname }} at $(date -R)" | sendmail {{ postfix_notify_email }}
-  when: postfix_notify_email is defined
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -7,6 +7,8 @@
     - common
     - postfix
 
+# @todo: Update to use new mktemp module from
+# https://github.com/ansible/ansible-modules-extras/pull/2991
 - name: Create pre-seed values for Postfix configuration
   template: >
     src=tmp-postfix_selections.j2
@@ -31,7 +33,7 @@
   apt: >
     pkg={{ item }}
     update_cache=yes
-    state=latest
+    state=installed
   with_items: '{{ postfix_packages }}'
   when: ansible_os_family == 'Debian'
   tags:
@@ -82,6 +84,21 @@
     - common
     - postfix
 
+- name: Write Postfix configuration for masquerading
+  template: >
+    src=recipient_canonical_map.j2
+    dest={{ postfix_config_dir }}/recipient_canonical_map
+    mode=0644 owner=root group=root
+    backup=yes
+  notify:
+    - restart postfix
+    - send test email
+  tags:
+    - common
+    - postfix
+  when:
+    - postfix_masquerade_address is defined
+
 - name: Start Postfix on server boot
   service: >
     name={{ postfix_service }}

diff --git a/templates/main-cf.j2 b/templates/main-cf.j2
@@ -30,10 +30,16 @@ smtp_use_tls = yes
 myhostname = {{ inventory_hostname }}
 myorigin = $mydomain
 mydestination =
-mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
+mynetworks = {{ postfix_mynetworks }}
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 mailbox_size_limit = 0
 recipient_delimiter = +
-inet_interfaces = loopback-only
-relayhost = {% if postfix_relayhost is defined %}{{ postfix_relayhost }}{% else %}$mydomain{% endif %}
+inet_interfaces = {{ postfix_inet_interfaces }}
+{% if postfix_relayhost is defined %}
+relayhost = {{ postfix_relayhost }}
+{% endif %}
+{% if postfix_masquerade_address is defined %}
+recipient_canonical_classes = envelope_recipient
+recipient_canonical_maps = regexp:/etc/postfix/recipient_canonical_map
+{% endif %}
diff --git a/templates/recipient_canonical_map.j2 b/templates/recipient_canonical_map.j2
@@ -0,0 +1 @@
+/./ {{ postfix_masquerade_address }}