summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Graumann <johannes_graumann@web.de>2012-10-15 22:34:14 +0300
committerPaul Klos <kolab@klos2day.nl>2012-10-24 07:31:18 -0400
commitc3ea31c955a924b89f3a4e2abbdad5233dafbd71 (patch)
tree2b5c7602376f83090a37258c9332148d02e252c8
parent0d0c09ab361d6712a2fc43ee9c487dbad6a98865 (diff)
downloadpykolab-c3ea31c955a924b89f3a4e2abbdad5233dafbd71.tar.gz
Debianize: Conditionally adapt amavisd configuration path;
(cherry picked from commit 728ca8f9910761474ec7ad4fedd6e5793040596c)
-rw-r--r--pykolab/setup/setup_mta.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index bc250a8..26885eb 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -289,7 +289,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()