Resolves: bug 227771

Bug Description: FHS: use sysconfdir (/etc) as config file location - allow builders to set dynamic config directory location at configure time
Reviewed by: nhosoi, nkinder, prowley (Thanks!)
Fix Description: I've added a new configure switch: --with-instconfigdir.  This switch will allow the user to specify a different location to store the dynamic instance specific config files rather than the default $sysconfdir/$package_name (e.g. /etc/fedora-ds).  This is the directory which will contain the slapd-instance directories which contain the instance specific config, schema, and security files.  Even though the user could override this with ds_newinst.pl ([slapd] section config_dir), we needed to be able to set the default so that the user would not have to remember to do this every time, and so that packagers could set a reasonable default value for their platform.
Platforms tested: FC6, RHEL4
Flag Day: no
Doc impact: no

1 files changed, 5 insertions, 2 deletions

diff --git a/ldap/admin/src/ds_newinst.pl.in b/ldap/admin/src/ds_newinst.pl.in
index 44fb6a31..11124bd7 100644
--- a/ldap/admin/src/ds_newinst.pl.in
+++ b/ldap/admin/src/ds_newinst.pl.in
@@ -194,10 +194,13 @@ $cgiargs{"sbindir"} = $table{"slapd"}->{"sbindir"};
 $cgiargs{"datadir"} = $table{"slapd"}->{"datadir"};
 $cgiargs{"docdir"} = $table{"slapd"}->{"docdir"};
 $cgiargs{"inst_dir"} = $table{"slapd"}->{"inst_dir"};
-$cgiargs{"config_dir"} = $table{"slapd"}->{"config_dir"};
 $cgiargs{"schema_dir"} = $table{"slapd"}->{"schema_dir"};
 $cgiargs{"sasl_path"} = $table{"slapd"}->{"sasl_path"};
-
+if ($table{"slapd"}->{"config_dir"}) {
+    $cgiargs{"config_dir"} = $table{"slapd"}->{"config_dir"};
+} else {
+    $cgiargs{"config_dir"} = "@instconfigdir@/slapd-" . $table{"slapd"}->{"ServerIdentifier"};
+}
 # port number for Admin Server - used to configure some web apps
 $cgiargs{adminport} = $table{admin}->{Port};