File pykolab-0.7.15-SUSE_setup_roundcube_services.patch of Package pykolab

Overview Repositories Revisions Requests Users Attributes Meta

File pykolab-0.7.15-SUSE_setup_roundcube_services.patch of Package pykolab (Revision a45a8da4463bd3c35cd34670f2c872bb)

Currently displaying revision a45a8da4463bd3c35cd34670f2c872bb , Show latest

diff -Ppru pykolab-0.7.15.orig/pykolab/setup/setup_roundcube.py pykolab-0.7.15.roundcube/pykolab/setup/setup_roundcube.py
--- pykolab-0.7.15.orig/pykolab/setup/setup_roundcube.py	2015-08-13 17:51:03.000000000 +0200
+++ pykolab-0.7.15.roundcube/pykolab/setup/setup_roundcube.py	2015-10-29 17:41:39.747505103 +0100
@@ -18,6 +18,7 @@
 #
 
 from Cheetah.Template import Template
+from platform import linux_distribution
 import grp
 import hashlib
 import os
@@ -252,24 +253,30 @@ password='%s'
                 os.chown(os.path.join(root, filename), root_uid, webserver_gid)
 
     if os.path.isfile('/bin/systemctl'):
-        if os.path.isfile('/etc/debian_version'):
+        if (os.path.isfile('/etc/debian_version') or ('SUSE' in linux_distribution()[0])):
             subprocess.call(['/bin/systemctl', 'restart', 'apache2.service'])
         else:
             subprocess.call(['/bin/systemctl', 'restart', 'httpd.service'])
     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:
         log.error(_("Could not start the webserver server service."))
 
     if os.path.isfile('/bin/systemctl'):
-        if os.path.isfile('/etc/debian_version'):
+        if (os.path.isfile('/etc/debian_version') or ('SUSE' in linux_distribution()[0])):
             subprocess.call(['/bin/systemctl', 'enable', 'apache2.service'])
         else:
             subprocess.call(['/bin/systemctl', 'enable', 'httpd.service'])
     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:

Places

File pykolab-0.7.15-SUSE_setup_roundcube_services.patch of Package pykolab (Revision a45a8da4463bd3c35cd34670f2c872bb)

Places