[PATCH 13/16] Demianize amavis configuration directory from '/etc/amavisd' to '/etc/amavis';

[Johannes Graumann]

---
 pykolab/setup/setup_mta.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index 36e6750..b4afbee 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -279,7 +279,10 @@ result_attribute = mail
         fp.close()
 
         t = Template(template_definition, searchList=[amavisd_settings])
-        fp = open('/etc/amavisd/amavisd.conf', 'w')
+        if os.path.isdir('/etc/amavisd'):
+	  fp = open('/etc/amavisd/amavisd.conf', 'w')
+	elif os.path.isdir('/etc/amavis'):
+	  fp = open('/etc/amavis/amavisd.conf', 'w')
         fp.write(t.__str__())
         fp.close()
 
-- 
1.7.10.4