summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Graumann <johannes_graumann@web.de>2012-10-15 22:35:45 +0300
committerPaul Klos <kolab@klos2day.nl>2012-10-24 07:32:19 -0400
commitfd18fa9adb754db6178bda26e48ccea31375de2d (patch)
tree5cbb679f502b1280df43d74c8389d432c12bb712
parentc3ea31c955a924b89f3a4e2abbdad5233dafbd71 (diff)
downloadpykolab-fd18fa9adb754db6178bda26e48ccea31375de2d.tar.gz
Debianize: Provide amavisd-requested /etc/mailname - possibly remediable through enhancement filed as #1080?
(cherry picked from commit a01d23ee133c90565f7ef0a49f41970ccc7efa75)
-rw-r--r--pykolab/setup/setup_mta.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index 26885eb..6f0c102 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -306,6 +306,11 @@ result_attribute = mail
# while really it isn't required.
else:
log.info(_("Not writing out any configuration for Amavis."))
+ # On debian wheezy amavisd-new expects '/etc/mailname' - possibly remediable through
+ # the #1080 enhancement mentioned above, but here's a quick fix.
+ f = open('/etc/mailname','w')
+ f.writelines(conf.get('kolab', 'primary_domain'))
+ f.close()
if os.path.isfile('/bin/systemctl'):
subprocess.call(['systemctl', 'restart', 'postfix.service'])