diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2014-01-15 15:21:59 +0100 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2015-06-07 02:51:40 +0200 |
| commit | c836fecd1b0ae3c6348ade420cd8e0222cdb66eb (patch) | |
| tree | 0ff38de631b103239cd5f89c66a91ba8eb5d1407 /roles/IMAP | |
| parent | 8cca963be44becc5052da6f5ba1c1d7a705caaca (diff) | |
Make the *_maps file names uniform.
That is, don't put a leading virtual_ or a trailing _maps in file names.
Diffstat (limited to 'roles/IMAP')
| -rw-r--r-- | roles/IMAP/files/etc/postfix/virtual/mailbox.cf (renamed from roles/IMAP/files/etc/postfix/virtual/mailbox_maps.cf) | 0 | ||||
| -rw-r--r-- | roles/IMAP/files/etc/postfix/virtual/transport_content_filter.cf (renamed from roles/IMAP/files/etc/postfix/virtual/transport_content_filter_maps.cf) | 0 | ||||
| -rw-r--r-- | roles/IMAP/tasks/mda.yml | 4 | ||||
| -rw-r--r-- | roles/IMAP/templates/etc/postfix/main.cf.j2 | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/roles/IMAP/files/etc/postfix/virtual/mailbox_maps.cf b/roles/IMAP/files/etc/postfix/virtual/mailbox.cf index 009dd98..009dd98 100644 --- a/roles/IMAP/files/etc/postfix/virtual/mailbox_maps.cf +++ b/roles/IMAP/files/etc/postfix/virtual/mailbox.cf diff --git a/roles/IMAP/files/etc/postfix/virtual/transport_content_filter_maps.cf b/roles/IMAP/files/etc/postfix/virtual/transport_content_filter.cf index b082f69..b082f69 100644 --- a/roles/IMAP/files/etc/postfix/virtual/transport_content_filter_maps.cf +++ b/roles/IMAP/files/etc/postfix/virtual/transport_content_filter.cf diff --git a/roles/IMAP/tasks/mda.yml b/roles/IMAP/tasks/mda.yml index cef40a0..1aac519 100644 --- a/roles/IMAP/tasks/mda.yml +++ b/roles/IMAP/tasks/mda.yml @@ -9,28 +9,28 @@ 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 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 + - mailbox.cf + - transport_content_filter.cf - name: Start Postfix service: name=postfix state=started when: not r.changed - meta: flush_handlers diff --git a/roles/IMAP/templates/etc/postfix/main.cf.j2 b/roles/IMAP/templates/etc/postfix/main.cf.j2 index 2da85e9..e4c01bd 100644 --- a/roles/IMAP/templates/etc/postfix/main.cf.j2 +++ b/roles/IMAP/templates/etc/postfix/main.cf.j2 @@ -35,27 +35,27 @@ inet_interfaces = 172.16.0.1 inet_protocols = ipv4 # 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 = + # No relay: this server is inbound-only relay_transport = error:5.1.1 Relay unavailable default_transport = error:5.1.1 Transport unavailable # Virtual transport (the alias resolution is already done by the MX:es) virtual_transport = lmtp:unix:private/dovecot-lmtpd lmtp_bind_address = 127.0.0.1 virtual_mailbox_domains = ldap:$config_directory/virtual/mailbox_domains.cf -virtual_mailbox_maps = ldap:$config_directory/virtual/mailbox_maps.cf -transport_maps = ldap:$config_directory/virtual/transport_content_filter_maps.cf +virtual_mailbox_maps = ldap:$config_directory/virtual/mailbox.cf +transport_maps = ldap:$config_directory/virtual/transport_content_filter.cf # Don't rewrite remote headers local_header_rewrite_clients = # Tolerate occasional high latency smtpd_timeout = 1200s |