summaryrefslogtreecommitdiffstats
path: root/pykolab/setup
diff options
context:
space:
mode:
Diffstat (limited to 'pykolab/setup')
-rw-r--r--pykolab/setup/setup_ldap.py10
-rw-r--r--pykolab/setup/setup_mta.py12
2 files changed, 10 insertions, 12 deletions
diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index c173be4..2960c49 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -223,14 +223,12 @@ ServerAdminPwd = %(admin_pass)s
os.close(fp)
if os.path.isfile("/usr/sbin/setup-ds-admin.pl"):
- setup_ds_admin = "/usr/sbin/setup-ds-admin.pl"
-# elif os.path.isfile("/usr/sbin/setup-ds-admin"):
-# setup_ds_admin = "/usr/sbin/setup-ds-admin"
+ setup_ds_admin = "/usr/sbin/setup-ds-admin.pl"
elif os.path.isfile("/usr/sbin/setup-ds"):
- setup_ds_admin = "/usr/sbin/setup-ds"
+ setup_ds_admin = "/usr/sbin/setup-ds"
else:
- log.error(_("No directory server setup tool available."))
-
+ log.error(_("No directory server setup tool available."))
+
command = [
setup_ds_admin,
'--debug',
diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index bb37d27..bc250a8 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -210,12 +210,12 @@ result_attribute = mail
}
if not os.path.isfile('/etc/postfix/main.cf'):
- if os.path.isfile('/usr/share/postfix/main.cf.debian'):
- shutil.copy(
- '/usr/share/postfix/main.cf.debian',
- '/etc/postfix/main.cf'
- )
-
+ if os.path.isfile('/usr/share/postfix/main.cf.debian'):
+ shutil.copy(
+ '/usr/share/postfix/main.cf.debian',
+ '/etc/postfix/main.cf'
+ )
+
myaugeas = Augeas()
setting_base = '/files/etc/postfix/main.cf/'