dirsrvtests/tests/tickets/ticket47669_test.py | 2 +-
ldap/admin/src/defaults.inf.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4d448d3829d21f22d6363cac96a5e00850ee6942
Author: Simon Pichugin <spichugi(a)redhat.com>
Date: Mon Nov 7 21:01:56 2016 +0100
Ticket 49024 - Fix inst_dir parameter in defaults.inf
Description: The inst_dir parameter has wrong value that differs
from nsslapd-instancedir. Set inst_dir to @serverdir@ value.
Fix tests accordingly.
https://fedorahosted.org/389/ticket/49024
Reviewed by: wibrown (Thanks!)
diff --git a/dirsrvtests/tests/tickets/ticket47669_test.py
b/dirsrvtests/tests/tickets/ticket47669_test.py
index fd5299c..021ec15 100644
--- a/dirsrvtests/tests/tickets/ticket47669_test.py
+++ b/dirsrvtests/tests/tickets/ticket47669_test.py
@@ -85,7 +85,7 @@ def test_ticket47669_init(topology):
topology.standalone.simple_bind_s(DN_DM, PASSWORD)
try:
- changelogdir = os.path.join(topology.standalone.inst_dir, 'changelog')
+ changelogdir = os.path.join(os.path.dirname(topology.standalone.dbdir),
'changelog')
topology.standalone.add_s(Entry((CHANGELOG,
{'objectclass': 'top
extensibleObject'.split(),
'nsslapd-changelogdir': changelogdir})))
diff --git a/ldap/admin/src/defaults.inf.in b/ldap/admin/src/defaults.inf.in
index 7729c06..31dbf2f 100644
--- a/ldap/admin/src/defaults.inf.in
+++ b/ldap/admin/src/defaults.inf.in
@@ -34,6 +34,7 @@ config_dir = @instconfigdir@/slapd-{instance_name}
local_state_dir = @localstatedir@
run_dir = @localstatedir@/run/dirsrv
pid_file = @localstatedir(a)/run/dirsrv/slapd-{instance_name}.pid
+inst_dir = @serverdir@
plugin_dir = @serverplugindir@
; These values can be altered in an installation of ds
@@ -49,7 +50,6 @@ log_dir = @localstatedir@/log/dirsrv/slapd-{instance_name}
access_log = @localstatedir@/log/dirsrv/slapd-{instance_name}/access
audit_log = @localstatedir@/log/dirsrv/slapd-{instance_name}/audit
error_log = @localstatedir@/log/dirsrv/slapd-{instance_name}/errors
-inst_dir = @localstatedir@/lib/dirsrv/slapd-{instance_name}
db_dir = @localstatedir@/lib/dirsrv/slapd-{instance_name}/db
backup_dir = @localstatedir@/lib/dirsrv/slapd-{instance_name}/bak
ldif_dir = @localstatedir@/lib/dirsrv/slapd-{instance_name}/ldif