Bladeren bron

Ticket 48983 - Configure and Makefile.in from new default paths work.

Bug Description:   At configure time, this is the only time we know all the
resolved paths of a ds installation. However, external tools such as lib389
need to be able to discover and use these paths.

Fix Description:  This updates defaults.inf with some extra paths that were
found to be needed as part of the lib389 tests.

https://fedorahosted.org/389/ticket/48983

Author: wibrown

Review by: tbordaz, mreynolds (Thanks!)
William Brown 9 jaren geleden
bovenliggende
commit
088fe3ad3d
1 gewijzigde bestanden met toevoegingen van 14 en 7 verwijderingen
  1. 14 7
      ldap/admin/src/defaults.inf.in

+ 14 - 7
ldap/admin/src/defaults.inf.in

@@ -14,26 +14,33 @@
 ; All format strings should be in python syntax IE {key}
 
 [slapd]
+; These values should NOT be altered in an installation.
+; This is because the server itself depends on these locations and values
+; being known, and are set at compilation time.
 product = @capbrand@ Directory Server
 version = @PACKAGE_VERSION@
-user = dirsrv
-group = dirsrv
-root_dn = cn=Directory Manager
+asan_enabled = @enable_asan@
 prefix = @prefixdir@
 bin_dir = @bindir@
 sbin_dir = @sbindir@
 lib_dir = @libdir@
 data_dir = @datadir@
 tmp_dir = /tmp
-
 sysconf_dir = @sysconfdir@
-initconfigdir = @initconfigdir@
+initconfig_dir = @initconfigdir@
 config_dir = @instconfigdir@/slapd-{instance_name}
+local_state_dir = @localstatedir@
+run_dir = @localstatedir@/run/dirsrv
+plugin_dir = @serverplugindir@
+
+; These values can be altered in an installation of ds
+user = dirsrv
+group = dirsrv
+root_dn = cn=Directory Manager
+
 schema_dir = @instconfigdir@/slapd-{instance_name}/schema
 cert_dir = @instconfigdir@/slapd-{instance_name}
 
-local_state_dir = @localstatedir@
-run_dir = @localstatedir@/run/dirsrv
 lock_dir = @localstatedir@/lock/dirsrv/slapd-{instance_name}
 log_dir = @localstatedir@/log/dirsrv/slapd-{instance_name}
 inst_dir = @localstatedir@/lib/dirsrv/slapd-{instance_name}