File pykolab-0.7.17-SLE11.patch of Package pykolab
diff -Ppru pykolab-0.7.17.orig/pykolab/setup/setup_imap.py pykolab-0.7.17/pykolab/setup/setup_imap.py
--- pykolab-0.7.17.orig/pykolab/setup/setup_imap.py 2016-01-04 12:17:52.000000000 +0100
+++ pykolab-0.7.17/pykolab/setup/setup_imap.py 2016-01-06 16:52:33.362042956 +0100
@@ -19,6 +19,7 @@
from augeas import Augeas
from Cheetah.Template import Template
+from platform import linux_distribution
import os
import subprocess
@@ -153,7 +154,10 @@ def execute(*args, **kw):
elif os.path.isfile('/sbin/service'):
subprocess.call(['service', 'saslauthd', 'stop'])
subprocess.call(['service', 'kolab-saslauthd', 'restart'])
- subprocess.call(['service', 'cyrus-imapd', 'restart'])
+ if 'SUSE' in linux_distribution()[0]:
+ subprocess.call(['service', 'cyrus', 'restart'])
+ else
+ subprocess.call(['service', 'cyrus-imapd', 'restart'])
elif os.path.isfile('/usr/sbin/service'):
subprocess.call(['/usr/sbin/service','saslauthd','stop'])
subprocess.call(['/usr/sbin/service','kolab-saslauthd','restart'])
@@ -168,7 +172,10 @@ def execute(*args, **kw):
elif os.path.isfile('/sbin/chkconfig'):
subprocess.call(['chkconfig', 'saslauthd', 'off'])
subprocess.call(['chkconfig', 'kolab-saslauthd', 'on'])
- subprocess.call(['chkconfig', 'cyrus-imapd', 'on'])
+ if 'SUSE' in linux_distribution()[0]:
+ subprocess.call(['chkconfig', 'cyrus', 'on'])
+ else
+ subprocess.call(['chkconfig', 'cyrus-imapd', 'on'])
elif os.path.isfile('/usr/sbin/update-rc.d'):
subprocess.call(['/usr/sbin/update-rc.d', 'saslauthd', 'disable'])
subprocess.call(['/usr/sbin/update-rc.d', 'kolab-saslauthd', 'defaults'])
diff -Ppru pykolab-0.7.17.orig/pykolab/setup/setup_mta.py pykolab-0.7.17/pykolab/setup/setup_mta.py
--- pykolab-0.7.17.orig/pykolab/setup/setup_mta.py 2016-01-04 12:17:52.000000000 +0100
+++ pykolab-0.7.17/pykolab/setup/setup_mta.py 2016-01-07 14:07:31.835838349 +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
@@ -456,8 +457,12 @@ result_format = "shared+%%s"
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'])
@@ -474,8 +479,12 @@ result_format = "shared+%%s"
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'])
diff -Ppru pykolab-0.7.17.orig/pykolab/setup/setup_mysql.py pykolab-0.7.17/pykolab/setup/setup_mysql.py
--- pykolab-0.7.17.orig/pykolab/setup/setup_mysql.py 2016-01-04 12:17:52.000000000 +0100
+++ pykolab-0.7.17/pykolab/setup/setup_mysql.py 2016-01-07 14:13:10.891829462 +0100
@@ -24,6 +24,8 @@ import time
import components
+from platform import linux_distribution
+
import pykolab
from pykolab import utils
@@ -71,7 +73,10 @@ def execute(*args, **kw):
if os.path.isfile('/bin/systemctl'):
subprocess.call(['/bin/systemctl', 'restart', mysqlservice])
elif os.path.isfile('/sbin/service'):
- subprocess.call(['/sbin/service', 'mysqld', 'restart'])
+ if 'SUSE' in linux_distribution()[0]:
+ subprocess.call(['/sbin/service', 'mysql', 'restart'])
+ else
+ subprocess.call(['/sbin/service', 'mysqld', 'restart'])
elif os.path.isfile('/usr/sbin/service'):
subprocess.call(['/usr/sbin/service','mysql','restart'])
else:
@@ -80,7 +85,10 @@ def execute(*args, **kw):
if os.path.isfile('/bin/systemctl'):
subprocess.call(['/bin/systemctl', 'enable', mysqlservice])
elif os.path.isfile('/sbin/chkconfig'):
- subprocess.call(['/sbin/chkconfig', 'mysqld', 'on'])
+ if 'SUSE' in linux_distribution()[0]:
+ subprocess.call(['/sbin/chkconfig', 'mysql', 'on'])
+ else
+ subprocess.call(['/sbin/chkconfig', 'mysqld', 'on'])
elif os.path.isfile('/usr/sbin/update-rc.d'):
subprocess.call(['/usr/sbin/update-rc.d', 'mysql', 'defaults'])
else:
diff -Ppru pykolab-0.7.17.orig/pykolab/setup/setup_roundcube.py pykolab-0.7.17/pykolab/setup/setup_roundcube.py
--- pykolab-0.7.17.orig/pykolab/setup/setup_roundcube.py 2016-01-04 12:17:52.000000000 +0100
+++ pykolab-0.7.17/pykolab/setup/setup_roundcube.py 2016-01-07 14:17:46.735822231 +0100
@@ -18,6 +18,7 @@
#
from Cheetah.Template import Template
+from platform import linux_distribution
import grp
import hashlib
import os
@@ -268,7 +269,10 @@ password='%s'
if os.path.isfile('/bin/systemctl'):
subprocess.call(['/bin/systemctl', 'restart', httpservice])
elif os.path.isfile('/sbin/service'):
- subprocess.call(['/sbin/service', 'httpd', 'restart'])
+ if 'SUSE' in linux_distribution()[0]:
+ subprocess.call(['/sbin/service', 'apache2', 'restart'])
+ else
+ subprocess.call(['/sbin/service', 'httpd', 'restart'])
elif os.path.isfile('/usr/sbin/service'):
subprocess.call(['/usr/sbin/service','apache2','restart'])
else:
@@ -277,7 +281,10 @@ password='%s'
if os.path.isfile('/bin/systemctl'):
subprocess.call(['/bin/systemctl', 'enable', httpservice])
elif os.path.isfile('/sbin/chkconfig'):
- subprocess.call(['/sbin/chkconfig', 'httpd', 'on'])
+ if 'SUSE' in linux_distribution()[0]:
+ subprocess.call(['/sbin/chkconfig', 'apache2', 'on'])
+ else
+ subprocess.call(['/sbin/chkconfig', 'httpd', 'on'])
elif os.path.isfile('/usr/sbin/update-rc.d'):
subprocess.call(['/usr/sbin/update-rc.d', 'apache2', 'defaults'])
else:
diff -Ppru pykolab-0.7.17.orig/pykolab/setup/setup_syncroton.py pykolab-0.7.17/pykolab/setup/setup_syncroton.py
--- pykolab-0.7.17.orig/pykolab/setup/setup_syncroton.py 2016-01-04 12:17:52.000000000 +0100
+++ pykolab-0.7.17/pykolab/setup/setup_syncroton.py 2016-01-07 14:21:47.375815923 +0100
@@ -24,6 +24,8 @@ import time
import components
+from platform import linux_distribution
+
import pykolab
from pykolab import utils
@@ -93,7 +95,10 @@ password='%s'
if os.path.isfile('/bin/systemctl'):
subprocess.call(['/bin/systemctl', 'restart', httpservice])
elif os.path.isfile('/sbin/service'):
- subprocess.call(['/sbin/service', 'httpd', 'restart'])
+ if 'SUSE' in linux_distribution()[0]:
+ subprocess.call(['/sbin/service', 'apache2', 'restart'])
+ else
+ subprocess.call(['/sbin/service', 'httpd', 'restart'])
elif os.path.isfile('/usr/sbin/service'):
subprocess.call(['/usr/sbin/service','apache2','restart'])
else:
@@ -102,7 +107,10 @@ password='%s'
if os.path.isfile('/bin/systemctl'):
subprocess.call(['/bin/systemctl', 'enable', httpservice])
elif os.path.isfile('/sbin/chkconfig'):
- subprocess.call(['/sbin/chkconfig', 'httpd', 'on'])
+ if 'SUSE' in linux_distribution()[0]:
+ subprocess.call(['/sbin/chkconfig', 'apache2', 'on'])
+ else
+ subprocess.call(['/sbin/chkconfig', 'httpd', 'on'])
elif os.path.isfile('/usr/sbin/update-rc.d'):
subprocess.call(['/usr/sbin/update-rc.d', 'apache2', 'defaults'])
else:
