summaryrefslogtreecommitdiffstats
path: root/pykolab
diff options
context:
space:
mode:
authorPaul Klos <kolab@klos2day.nl>2012-10-24 07:13:36 -0400
committerPaul Klos <kolab@klos2day.nl>2012-10-24 07:13:36 -0400
commit2cbecd918f846ae7a22236c119c80ea695662d7a (patch)
tree8e5f0982c9020a156768fb25685c29ab60e26613 /pykolab
parent6c297ab957fb166c4e6c67361de50f98cf6d7c20 (diff)
downloadpykolab-2cbecd918f846ae7a22236c119c80ea695662d7a.tar.gz
Cherry-picked commits
6c297ab957fb166c4e6c67361de50f98cf6d7c20 cfc34c5f7fca9b45220c99e0bd6983dc3ea353f3 from master branch and corrected indentation.
Diffstat (limited to 'pykolab')
-rw-r--r--pykolab/setup/setup_freebusy.py2
-rw-r--r--pykolab/setup/setup_imap.py16
-rw-r--r--pykolab/setup/setup_kolabd.py2
-rw-r--r--pykolab/setup/setup_ldap.py6
-rw-r--r--pykolab/setup/setup_mta.py8
-rw-r--r--pykolab/setup/setup_mysql.py2
-rw-r--r--pykolab/setup/setup_roundcube.py2
-rw-r--r--pykolab/setup/setup_syncroton.py2
-rw-r--r--pykolab/setup/setup_zpush.py2
9 files changed, 21 insertions, 21 deletions
diff --git a/pykolab/setup/setup_freebusy.py b/pykolab/setup/setup_freebusy.py
index 7fe7d5f..9d99ca9 100644
--- a/pykolab/setup/setup_freebusy.py
+++ b/pykolab/setup/setup_freebusy.py
@@ -114,7 +114,7 @@ def execute(*args, **kw):
elif os.path.isfile('/sbin/service'):
subprocess.call(['/sbin/service', 'httpd', 'restart'])
elif os.path.isfile('/usr/sbin/service'):
- subprocess.call(['/usr/sbin/service','apache2','restart'])
+ subprocess.call(['/usr/sbin/service','apache2','restart'])
else:
log.error(_("Could not start the webserver server service."))
diff --git a/pykolab/setup/setup_imap.py b/pykolab/setup/setup_imap.py
index bd33a5b..4cf883d 100644
--- a/pykolab/setup/setup_imap.py
+++ b/pykolab/setup/setup_imap.py
@@ -131,12 +131,12 @@ def execute(*args, **kw):
fp.close()
if os.path.isfile('/etc/default/kolab-saslauthd'):
- myaugeas = Augeas()
- setting = os.path.join('/files/etc/default/kolab-saslauthd','START')
- if not myaugeas.get(setting) == 'yes':
- myaugeas.set(setting,'yes')
- myaugeas.save()
- myaugeas.close()
+ myaugeas = Augeas()
+ setting = os.path.join('/files/etc/default/kolab-saslauthd','START')
+ if not myaugeas.get(setting) == 'yes':
+ myaugeas.set(setting,'yes')
+ myaugeas.save()
+ myaugeas.close()
if os.path.isfile('/bin/systemctl'):
subprocess.call(['systemctl', 'restart', 'cyrus-imapd.service'])
@@ -145,8 +145,8 @@ def execute(*args, **kw):
subprocess.call(['service', 'cyrus-imapd', 'restart'])
subprocess.call(['service', 'kolab-saslauthd', 'restart'])
elif os.path.isfile('/usr/sbin/service'):
- subprocess.call(['/usr/sbin/service','cyrus-imapd','restart'])
- subprocess.call(['/usr/sbin/service','kolab-saslauthd','restart'])
+ subprocess.call(['/usr/sbin/service','cyrus-imapd','restart'])
+ subprocess.call(['/usr/sbin/service','kolab-saslauthd','restart'])
else:
log.error(_("Could not start the cyrus-imapd and kolab-saslauthd services."))
diff --git a/pykolab/setup/setup_kolabd.py b/pykolab/setup/setup_kolabd.py
index df05043..47d1cae 100644
--- a/pykolab/setup/setup_kolabd.py
+++ b/pykolab/setup/setup_kolabd.py
@@ -67,7 +67,7 @@ def execute(*args, **kw):
elif os.path.isfile('/sbin/service'):
subprocess.call(['/sbin/service', 'kolabd', 'restart'])
elif os.path.isfile('/usr/sbin/service'):
- subprocess.call(['/usr/sbin/service','kolab-server','restart'])
+ subprocess.call(['/usr/sbin/service','kolab-server','restart'])
else:
log.error(_("Could not start the kolab server service."))
diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index df836c4..2fe2baf 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -288,9 +288,9 @@ ServerAdminPwd = %(admin_pass)s
elif os.path.isfile('/sbin/service'):
subprocess.call(['/sbin/service', 'dirsrv', 'restart'])
elif os.path.isfile('/usr/sbin/service'):
- subprocess.call(['/usr/sbin/service','dirsrv','stop'])
- time.sleep(20)
- subprocess.call(['/usr/sbin/service','dirsrv','start'])
+ subprocess.call(['/usr/sbin/service','dirsrv','stop'])
+ time.sleep(20)
+ subprocess.call(['/usr/sbin/service','dirsrv','start'])
else:
log.error(_("Could not start the directory server service."))
diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index 09f6d06..d91a3a7 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -307,10 +307,10 @@ result_attribute = mail
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'])
- subprocess.call(['/usr/sbin/service','amavis','restart'])
- subprocess.call(['/usr/sbin/service','clamav-daemon','restart'])
- subprocess.call(['/usr/sbin/service','wallace','restart'])
+ subprocess.call(['/usr/sbin/service','postfix','restart'])
+ subprocess.call(['/usr/sbin/service','amavis','restart'])
+ subprocess.call(['/usr/sbin/service','clamav-daemon','restart'])
+ subprocess.call(['/usr/sbin/service','wallace','restart'])
else:
log.error(_("Could not start the postfix, clamav and amavisd services services."))
diff --git a/pykolab/setup/setup_mysql.py b/pykolab/setup/setup_mysql.py
index e4940a0..975c2fe 100644
--- a/pykolab/setup/setup_mysql.py
+++ b/pykolab/setup/setup_mysql.py
@@ -44,7 +44,7 @@ def execute(*args, **kw):
elif os.path.isfile('/sbin/service'):
subprocess.call(['/sbin/service', 'mysqld', 'restart'])
elif os.path.isfile('/usr/sbin/service'):
- subprocess.call(['/usr/sbin/service','mysql','restart'])
+ subprocess.call(['/usr/sbin/service','mysql','restart'])
else:
log.error(_("Could not start the MySQL database service."))
diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py
index 4a5b394..8361d8c 100644
--- a/pykolab/setup/setup_roundcube.py
+++ b/pykolab/setup/setup_roundcube.py
@@ -185,7 +185,7 @@ def execute(*args, **kw):
elif os.path.isfile('/sbin/service'):
subprocess.call(['/sbin/service', 'httpd', 'restart'])
elif os.path.isfile('/usr/sbin/service'):
- subprocess.call(['/usr/sbin/service','apache2','restart'])
+ subprocess.call(['/usr/sbin/service','apache2','restart'])
else:
log.error(_("Could not start the webserver server service."))
diff --git a/pykolab/setup/setup_syncroton.py b/pykolab/setup/setup_syncroton.py
index 46d5190..c14682e 100644
--- a/pykolab/setup/setup_syncroton.py
+++ b/pykolab/setup/setup_syncroton.py
@@ -61,7 +61,7 @@ def execute(*args, **kw):
elif os.path.isfile('/sbin/service'):
subprocess.call(['/sbin/service', 'httpd', 'restart'])
elif os.path.isfile('/usr/sbin/service'):
- subprocess.call(['/usr/sbin/service','apache2','restart'])
+ subprocess.call(['/usr/sbin/service','apache2','restart'])
else:
log.error(_("Could not start the webserver server service."))
diff --git a/pykolab/setup/setup_zpush.py b/pykolab/setup/setup_zpush.py
index b1ba921..4c84d3a 100644
--- a/pykolab/setup/setup_zpush.py
+++ b/pykolab/setup/setup_zpush.py
@@ -93,7 +93,7 @@ def execute(*args, **kw):
elif os.path.isfile('/sbin/service'):
subprocess.call(['/sbin/service', 'httpd', 'restart'])
elif os.path.isfile('/usr/sbin/service'):
- subprocess.call(['/usr/sbin/service','apache2','restart'])
+ subprocess.call(['/usr/sbin/service','apache2','restart'])
else:
log.error(_("Could not start the webserver server service."))