admserv/newinst/src/AdminServer.pm.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 98446b8e5b19da085371ee751f2aed33504657ff
Author: William Brown <wibrown(a)redhat.com>
Date: Fri Oct 30 10:54:12 2015 +1000
Ticket 47840 - Fix setup-ds-admin.pl to create adm.conf with sbin scripts
https://fedorahosted.org/389/ticket/47840
Bug Description: Now that
https://fedorahosted.org/389/ticket/528 is fixed, the
next step is to allow building the server with the instance specific scripts
disabled.
Fix Description: This corrects the behaviour of setup-ds-admin.pl to write out
it's adm.conf for the configuration directory, to utilise the sbin scripts with
an argument to start the dirsrv instances rather than using the per instance
script.
Author: wibrown
Review by: nhosoi (Thanks!)
diff --git a/admserv/newinst/src/AdminServer.pm.in
b/admserv/newinst/src/AdminServer.pm.in
index a141596..eb80d19 100644
--- a/admserv/newinst/src/AdminServer.pm.in
+++ b/admserv/newinst/src/AdminServer.pm.in
@@ -210,8 +210,9 @@ sub makeConfFiles {
my @start_slapd;
if ($setup->{inf}->{slapd}->{SlapdConfigForMC} =~ /yes/i) {
- my $inst_dir = $setup->{inf}->{slapd}->{inst_dir};
- @start_slapd = ('ldapStart', "$inst_dir/start-slapd");
+ my $sbindir = $setup->{inf}->{slapd}->{sbindir};
+ my $inst_name = $setup->{inf}->{slapd}->{ServerIdentifier};
+ @start_slapd = ('ldapStart', "$sbindir/start-dirsrv
$inst_name");
}
$setup->msg('updating_admconf');
my $rc = updateAdmConf({ldapurl =>
$setup->{inf}->{General}->{ConfigDirectoryLdapURL},