Browse Source

Revert "ansible-playbooks/forward.yml alias maps hash->regexp"

This reverts commit 14ccd2df06c6f965052db907fa183531807b8b50.
Fabian Peter Hammerle 4 years ago
parent
commit
9fae38186d
1 changed files with 8 additions and 4 deletions
  1. 8 4
      ansible-playbooks/forward.yml

+ 8 - 4
ansible-playbooks/forward.yml

@@ -24,9 +24,10 @@
     copy:
       # http://www.postfix.org/virtual.5.html
       content: |
-        /^alice/ alice@gmail.com
-        /^bob/ bob@gmail.com
-        /^postmaster\@/ alice@gmail.com
+        alice@example.co alice@gmail.com
+        office@example.info alice@gmail.com
+        bob@example.co bob@gmail.com
+        bob@example.com bob@gmail.com
       dest: '{{ config_volume.ansible_facts.docker_volume.Mountpoint }}/virtual'
       mode: u=r,g=,o=
       # workaround if userns remapping enabled
@@ -96,7 +97,7 @@
         mydestination =
         # http://www.postfix.org/VIRTUAL_README.html#virtual_alias
         virtual_alias_domains = {{ virtual_alias_domains | join(', ') }}
-        virtual_alias_maps = regexp:/etc/postfix/virtual
+        virtual_alias_maps = hash:/etc/postfix/virtual
 
         # include TLS protocol & cipher in 'Received' header
         smtpd_tls_received_header = yes
@@ -136,6 +137,9 @@
       - '{{ queue_volume.ansible_facts.docker_volume.Mountpoint }}:/var/spool/postfix:rw'
       - '{{ config_volume.ansible_facts.docker_volume.Mountpoint }}/key.pem:/smtpd-key.pem:ro'
       - '{{ config_volume.ansible_facts.docker_volume.Mountpoint }}/cert.pem:/smtpd-cert.pem:ro'
+      env:
+        POSTMAP_PATHS: |
+          /etc/postfix/virtual
       networks: [name: mail]
       purge_networks: yes
       published_ports: ['25:25']