From 8dfcb7e08442b4af8f285bdd7732750938b25b9f Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Sun, 15 Dec 2013 04:59:30 +0100
Subject: Use postmulti to run postconf per instance.

---
 lib/postmap | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'lib/postmap')

diff --git a/lib/postmap b/lib/postmap
index 5691c48..7080b25 100644
--- a/lib/postmap
+++ b/lib/postmap
@@ -27,11 +27,16 @@ except ImportError:
 # pick the default_detabase_type of the given instance instead.
 def file_suffix(instance, db):
     if not db:
-        cmd = [ os.path.join(os.sep, 'usr', 'sbin', 'postconf') ]
         if instance:
-            config = os.path.join(os.sep, 'etc', 'postfix-%s' % instance)
-            cmd.extend([ '-c', config ])
-        cmd.extend([ '-h', 'default_database_type' ])
+            cmd = [ os.path.join(os.sep, 'usr', 'sbin', 'postmulti')
+                  , '-x'
+                  , '-i', instance
+                  , '--'
+                  ]
+        else:
+            cmd = []
+        cmd.extend([ os.path.join(os.sep, 'usr', 'sbin', 'postconf')
+                   , '-h', 'default_database_type' ])
         null = open (os.devnull, 'wb')
         db = subprocess.check_output(cmd, stderr=null).rstrip()
         null.closed
-- 
cgit v1.2.3