diff options
Diffstat (limited to 'setup-script.patch')
| -rw-r--r-- | setup-script.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/setup-script.patch b/setup-script.patch index 36343c35c4cd..3a8223adeeaa 100644 --- a/setup-script.patch +++ b/setup-script.patch @@ -101,7 +101,7 @@ diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py index c805d20..1786438 100644 --- a/pykolab/setup/setup_ldap.py +++ b/pykolab/setup/setup_ldap.py -@@ -321,6 +321,8 @@ ServerAdminPwd = %(admin_pass)s +@@ -332,6 +332,8 @@ ServerAdminPwd = %(admin_pass)s setup_ds_admin = "/usr/sbin/setup-ds.pl" elif os.path.isfile("/usr/sbin/setup-ds"): setup_ds_admin = "/usr/sbin/setup-ds" @@ -110,7 +110,7 @@ index c805d20..1786438 100644 else: log.error(_("No directory server setup tool available.")) sys.exit(1) -@@ -406,7 +408,7 @@ ServerAdminPwd = %(admin_pass)s +@@ -417,7 +419,7 @@ ServerAdminPwd = %(admin_pass)s schema_error = True if os.path.isfile('/bin/systemctl'): @@ -119,7 +119,7 @@ index c805d20..1786438 100644 elif os.path.isfile('/sbin/service'): subprocess.call(['/sbin/service', 'dirsrv', 'restart']) elif os.path.isfile('/usr/sbin/service'): -@@ -417,7 +419,7 @@ ServerAdminPwd = %(admin_pass)s +@@ -428,7 +430,7 @@ ServerAdminPwd = %(admin_pass)s log.error(_("Could not start the directory server service.")) if os.path.isfile('/bin/systemctl'): @@ -176,7 +176,7 @@ diff --git a/pykolab/setup/setup_mysql.py b/pykolab/setup/setup_mysql.py index 174cbc7..1e0d70f 100644 --- a/pykolab/setup/setup_mysql.py +++ b/pykolab/setup/setup_mysql.py -@@ -170,7 +170,7 @@ password='%s' +@@ -186,7 +186,7 @@ password='%s' p2.communicate() conf.command_set('kolab_wap', 'sql_uri', 'mysql://kolab:%s@localhost/kolab' % (mysql_kolab_password)) |