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 | |
| parent | 8cca963be44becc5052da6f5ba1c1d7a705caaca (diff) | |
Make the *_maps file names uniform.
That is, don't put a leading virtual_ or a trailing _maps in file names.
| -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 | ||||
| -rw-r--r-- | roles/lists/files/etc/postfix/virtual/transport_list.cf (renamed from roles/lists/files/etc/postfix/virtual/transport_lists_maps.cf) | 0 | ||||
| -rw-r--r-- | roles/lists/tasks/mail.yml | 2 | ||||
| -rw-r--r-- | roles/lists/templates/etc/postfix/main.cf.j2 | 2 |
7 files changed, 6 insertions, 6 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 @@ -26,8 +26,8 @@ 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 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 @@ -52,8 +52,8 @@ default_transport = error:5.1.1 Transport unavailable 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 = diff --git a/roles/lists/files/etc/postfix/virtual/transport_lists_maps.cf b/roles/lists/files/etc/postfix/virtual/transport_list.cf index f85c4f8..f85c4f8 100644 --- a/roles/lists/files/etc/postfix/virtual/transport_lists_maps.cf +++ b/roles/lists/files/etc/postfix/virtual/transport_list.cf diff --git a/roles/lists/tasks/mail.yml b/roles/lists/tasks/mail.yml index 7bd471e..eb2fcc4 100644 --- a/roles/lists/tasks/mail.yml +++ b/roles/lists/tasks/mail.yml @@ -26,7 +26,7 @@ mode=0644 with_items: - mailbox_domains.cf - - transport_lists_maps.cf + - transport_list.cf - name: Start Postfix service: name=postfix state=started diff --git a/roles/lists/templates/etc/postfix/main.cf.j2 b/roles/lists/templates/etc/postfix/main.cf.j2 index dff9d0a..955b901 100644 --- a/roles/lists/templates/etc/postfix/main.cf.j2 +++ b/roles/lists/templates/etc/postfix/main.cf.j2 @@ -55,7 +55,7 @@ relayhost = [{{ MTA_out.host }}]:{{ MTA_out.port }} relay_domains = # Virtual transport (the alias resolution is already done by the MX:es) -transport_maps = ldap:$config_directory/virtual/transport_lists_maps.cf +transport_maps = ldap:$config_directory/virtual/transport_list.cf mlmmj_destination_recipient_limit = 1 # Don't rewrite remote headers |