File pykolab-0.6.13-SUSE_setup_mta_services.patch of Package pykolab

Overview Repositories Revisions Requests Users Attributes Meta

File pykolab-0.6.13-SUSE_setup_mta_services.patch of Package pykolab (Revision a11457f5b94f367da7b867f975ae6856)

Currently displaying revision a11457f5b94f367da7b867f975ae6856 , Show latest

diff -Ppru pykolab-0.7.5.orig/pykolab/setup/setup_mta.py pykolab-0.7.5-SUSE_setup_mta_services.patch/pykolab/setup/setup_mta.py
--- pykolab-0.7.5.orig/pykolab/setup/setup_mta.py	2014-12-31 12:27:05.000000000 +0100
+++ pykolab-0.7.5-SUSE_setup_mta_services.patch/pykolab/setup/setup_mta.py	2015-01-02 16:43:59.191365084 +0100
@@ -19,6 +19,7 @@
 
 from augeas import Augeas
 from Cheetah.Template import Template
+from platform import linux_distribution
 import os
 import shutil
 import subprocess
@@ -430,13 +431,21 @@ result_format = shared+%%s
 
     if os.path.isfile('/bin/systemctl'):
         subprocess.call(['systemctl', 'restart', 'postfix.service'])
-        subprocess.call(['systemctl', 'restart', 'amavisd.service'])
-        subprocess.call(['systemctl', 'restart', 'clamd@amavisd.service'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['systemctl', 'restart', 'amavis.service'])
+            subprocess.call(['systemctl', 'restart', 'clamd.service'])
+        else:
+            subprocess.call(['systemctl', 'restart', 'amavisd.service'])
+            subprocess.call(['systemctl', 'restart', 'clamd@amavisd.service'])
         subprocess.call(['systemctl', 'restart', 'wallace.service'])
     elif os.path.isfile('/sbin/service'):
         subprocess.call(['service', 'postfix', 'restart'])
-        subprocess.call(['service', 'amavisd', 'restart'])
-        subprocess.call(['service', 'clamd.amavisd', 'restart'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['service', 'amavis', 'restart'])
+            subprocess.call(['service', 'clamd', 'restart'])
+        else:
+            subprocess.call(['service', 'amavisd', 'restart'])
+            subprocess.call(['service', 'clamd.amavisd', 'restart'])
         subprocess.call(['service', 'wallace', 'restart'])
     elif os.path.isfile('/usr/sbin/service'):
         subprocess.call(['/usr/sbin/service','postfix','restart'])
@@ -448,13 +457,21 @@ result_format = shared+%%s
 
     if os.path.isfile('/bin/systemctl'):
         subprocess.call(['systemctl', 'enable', 'postfix.service'])
-        subprocess.call(['systemctl', 'enable', 'amavisd.service'])
-        subprocess.call(['systemctl', 'enable', 'clamd@amavisd.service'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['systemctl', 'enable', 'amavis.service'])
+            subprocess.call(['systemctl', 'enable', 'clamd.service'])
+        else:
+            subprocess.call(['systemctl', 'enable', 'amavisd.service'])
+            subprocess.call(['systemctl', 'enable', 'clamd@amavisd.service'])
         subprocess.call(['systemctl', 'enable', 'wallace.service'])
     elif os.path.isfile('/sbin/chkconfig'):
         subprocess.call(['chkconfig', 'postfix', 'on'])
-        subprocess.call(['chkconfig', 'amavisd', 'on'])
-        subprocess.call(['chkconfig', 'clamd.amavisd', 'on'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['chkconfig', 'amavis', 'on'])
+            subprocess.call(['chkconfig', 'clamd', 'on'])
+        else:
+            subprocess.call(['chkconfig', 'amavisd', 'on'])
+            subprocess.call(['chkconfig', 'clamd.amavisd', 'on'])
         subprocess.call(['chkconfig', 'wallace', 'on'])
     elif os.path.isfile('/usr/sbin/update-rc.d'):
         subprocess.call(['/usr/sbin/update-rc.d', 'postfix', 'defaults'])

Places

File pykolab-0.6.13-SUSE_setup_mta_services.patch of Package pykolab (Revision a11457f5b94f367da7b867f975ae6856)

Places