From c836fecd1b0ae3c6348ade420cd8e0222cdb66eb Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 15 Jan 2014 15:21:59 +0100
Subject: Make the *_maps file names uniform.

That is, don't put a leading virtual_ or a trailing _maps in file names.
---
 roles/lists/files/etc/postfix/virtual/transport_list.cf       | 8 ++++++++
 roles/lists/files/etc/postfix/virtual/transport_lists_maps.cf | 8 --------
 roles/lists/tasks/mail.yml                                    | 2 +-
 roles/lists/templates/etc/postfix/main.cf.j2                  | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 roles/lists/files/etc/postfix/virtual/transport_list.cf
 delete mode 100644 roles/lists/files/etc/postfix/virtual/transport_lists_maps.cf

(limited to 'roles/lists')

diff --git a/roles/lists/files/etc/postfix/virtual/transport_list.cf b/roles/lists/files/etc/postfix/virtual/transport_list.cf
new file mode 100644
index 0000000..f85c4f8
--- /dev/null
+++ b/roles/lists/files/etc/postfix/virtual/transport_list.cf
@@ -0,0 +1,8 @@
+server_host      = ldapi://%2Fprivate%2Fldapi/
+version          = 3
+search_base      = fvl=%u,fvd=%d,ou=virtual,o=mailHosting,dc=fripost,dc=org
+domain           = static:all
+scope            = base
+bind             = none
+query_filter     = (&(objectClass=FripostVirtualList)(fvl=%u))
+result_attribute = fripostListManager
diff --git a/roles/lists/files/etc/postfix/virtual/transport_lists_maps.cf b/roles/lists/files/etc/postfix/virtual/transport_lists_maps.cf
deleted file mode 100644
index f85c4f8..0000000
--- a/roles/lists/files/etc/postfix/virtual/transport_lists_maps.cf
+++ /dev/null
@@ -1,8 +0,0 @@
-server_host      = ldapi://%2Fprivate%2Fldapi/
-version          = 3
-search_base      = fvl=%u,fvd=%d,ou=virtual,o=mailHosting,dc=fripost,dc=org
-domain           = static:all
-scope            = base
-bind             = none
-query_filter     = (&(objectClass=FripostVirtualList)(fvl=%u))
-result_attribute = fripostListManager
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
-- 
cgit v1.2.3