Attachment 147916 Details for Bug 227771 – diffs to add instconfigdir

[patch] diffs to add instconfigdir

cvsdiffs (text/plain), 7.27 KB, created by Rich Megginson on 2007-02-12 18:12:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-02-12 18:12:07 UTC

Size: 7.27 KB

patch

obsolete

>Index: ldapserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
>retrieving revision 1.24
>diff -u -8 -r1.24 Makefile.am
>--- ldapserver/Makefile.am	9 Feb 2007 23:28:19 -0000	1.24
>+++ ldapserver/Makefile.am	12 Feb 2007 18:09:22 -0000
>@@ -62,16 +62,17 @@
> configdir = $(sysconfdir)@configdir@
> sampledatadir = $(datadir)@sampledatadir@
> propertydir = $(sysconfdir)@propertydir@
> schemadir = $(sysconfdir)@schemadir@
> serverdir = $(libdir)@serverdir@
> serverplugindir = $(libdir)@serverplugindir@
> taskdir = $(datadir)@scripttemplatedir@
> initdir = $(sysconfdir)@initdir@
>+instconfigdir = @instconfigdir@
> 
> #------------------------
> # Build Products
> #------------------------
> sbin_PROGRAMS = ns-slapd
> 
> bin_PROGRAMS = dbscan-bin ds_newinst-bin dsktune-bin infadd-bin ldap-agent-bin \
> 	ldclt-bin ldif-bin migratecred-bin mmldif-bin pwdhash-bin rsearch-bin
>@@ -944,17 +945,18 @@
> 	-e 's,@datadir\@,$(datadir),g' \
> 	-e 's,@schemadir\@,$(schemadir),g' \
> 	-e 's,@serverdir\@,$(serverdir),g' \
> 	-e 's,@serverplugindir\@,$(serverplugindir),g' \
> 	-e 's,@taskdir\@,$(taskdir),g' \
> 	-e 's,@configdir\@,$(configdir),g' \
> 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
> 	-e 's,@localstatedir\@,$(localstatedir),g' \
>-	-e 's,@package_name\@,$(PACKAGE_NAME),g'
>+	-e 's,@package_name\@,$(PACKAGE_NAME),g' \
>+	-e 's,@instconfigdir\@,$(instconfigdir),g'
> else
> fixupcmd = sed \
> 	-e 's,@bindir\@,$(bindir),g' \
> 	-e 's,@sbindir\@,$(sbindir),g' \
> 	-e 's,@libdir\@,$(libdir),g' \
> 	-e 's,@nspr_libdir\@,$(nspr_libdir),g' \
> 	-e 's,@nss_libdir\@,$(nss_libdir),g' \
> 	-e 's,@ldapsdk_libdir\@,$(ldapsdk_libdir),g' \
>@@ -967,17 +969,18 @@
> 	-e 's,@datadir\@,$(datadir),g' \
> 	-e 's,@schemadir\@,$(schemadir),g' \
> 	-e 's,@serverdir\@,$(serverdir),g' \
> 	-e 's,@serverplugindir\@,$(serverplugindir),g' \
> 	-e 's,@taskdir\@,$(taskdir),g' \
> 	-e 's,@configdir\@,$(configdir),g' \
> 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
> 	-e 's,@localstatedir\@,$(localstatedir),g' \
>-	-e 's,@package_name\@,$(PACKAGE_NAME),g'
>+	-e 's,@package_name\@,$(PACKAGE_NAME),g' \
>+	-e 's,@instconfigdir\@,$(instconfigdir),g'
> endif
> 
> %: %.in
> 	mkdir -p $(dir $@)
> 	$(fixupcmd) $^ > $@
> 
> %/$(PACKAGE_NAME): %/initscript.in
> 	$(fixupcmd) $^ > $@
>Index: ldapserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.17
>diff -u -8 -r1.17 configure.ac
>--- ldapserver/configure.ac	9 Feb 2007 23:28:19 -0000	1.17
>+++ ldapserver/configure.ac	12 Feb 2007 18:09:22 -0000
>@@ -69,16 +69,18 @@
> [
>   AC_MSG_RESULT(no)
>   bundle="";
> ])
> AM_CONDITIONAL(BUNDLE,test "$bundle" = "1")
> 
> AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
> 
>+m4_include(m4/fhs.m4)
>+
> # installation paths - by default, configure will just
> # use /usr as the prefix for everything, which means
> # /usr/etc and /usr/var.  FHS sez to use /etc and /var.
> if test "$with_fhs" = "yes"; then
>   ac_default_prefix=/usr
>   prefix=$ac_default_prefix
>   exec_prefix=$prefix
> dnl as opposed to the default /usr/etc
>@@ -96,24 +98,42 @@
> # relative to sysconfdir
> schemadir=/$PACKAGE_NAME/schema
> # relative to libdir
> serverdir=/$PACKAGE_NAME
> # relative to libdir
> serverplugindir=/$PACKAGE_NAME/plugins
> # relative to datadir
> scripttemplatedir=/$PACKAGE_NAME/script-templates
>+
> AC_SUBST(configdir)
> AC_SUBST(sampledatadir)
> AC_SUBST(propertydir)
> AC_SUBST(schemadir)
> AC_SUBST(serverdir)
> AC_SUBST(serverplugindir)
> AC_SUBST(scripttemplatedir)
> 
>+AC_CHECKING(for instconfigdir)
>+
>+# check for --with-instconfigdir
>+AC_MSG_CHECKING(for --with-instconfigdir)
>+AC_ARG_WITH(instconfigdir, [  --with-instconfigdir=/path   Base directory for instance specific writable configuration directories (default $sysconfdir/$PACKAGE_NAME)],
>+[
>+  if test $withval = yes ; then
>+     AC_ERROR([Please specify a full path with --with-instconfigdir])
>+  fi
>+  instconfigdir="$withval"
>+],
>+[
>+  dnl this value is expanded out in Makefile.am
>+  instconfigdir='$(sysconfdir)/$(PACKAGE_NAME)'
>+])
>+AC_SUBST(instconfigdir)
>+
> # WINNT should be true if building on Windows system not using
> # cygnus, mingw, or the like and using cmd.exe as the shell
> AM_CONDITIONAL([WINNT], false)
> 
> # Deal with platform dependent defines
> # relative to sysconfdir
> initdir=/rc.d
> case $host in
>@@ -182,17 +202,16 @@
> m4_include(m4/nspr.m4)
> m4_include(m4/nss.m4)
> m4_include(m4/mozldap.m4)
> m4_include(m4/db.m4)
> m4_include(m4/sasl.m4)
> m4_include(m4/svrcore.m4)
> m4_include(m4/icu.m4)
> m4_include(m4/netsnmp.m4)
>-m4_include(m4/fhs.m4)
> 
> # write out paths for binary components
> AC_SUBST(nspr_inc)
> AC_SUBST(nspr_lib)
> AC_SUBST(nspr_libdir)
> AC_SUBST(nss_inc)
> AC_SUBST(nss_lib)
> AC_SUBST(nss_libdir)
>Index: ldapserver/ldap/admin/src/ds_newinst.pl.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl.in,v
>retrieving revision 1.3
>diff -u -8 -r1.3 ds_newinst.pl.in
>--- ldapserver/ldap/admin/src/ds_newinst.pl.in	9 Feb 2007 22:33:59 -0000	1.3
>+++ ldapserver/ldap/admin/src/ds_newinst.pl.in	12 Feb 2007 18:09:23 -0000
>@@ -189,20 +189,23 @@
> $cgiargs{"cert_dir"} = $table{"slapd"}->{"cert_dir"};
> $cgiargs{"localstatedir"} = $table{"slapd"}->{"localstatedir"};
> $cgiargs{"sysconfdir"} = $table{"slapd"}->{"sysconfdir"};
> $cgiargs{"bindir"} = $table{"slapd"}->{"bindir"};
> $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};
> 
> # If this is set, the new DS instance will be set up for use as
> # a Configuration DS (e.g. o=NetscapeRoot)
> if ($table{slapd}->{SlapdConfigForMC} =~ /yes/i) {
>     $cgiargs{cfg_sspt} = "1";
> }
>Index: ldapserver/wrappers/initscript.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/wrappers/initscript.in,v
>retrieving revision 1.1
>diff -u -8 -r1.1 initscript.in
>--- ldapserver/wrappers/initscript.in	9 Feb 2007 22:33:59 -0000	1.1
>+++ ldapserver/wrappers/initscript.in	12 Feb 2007 18:09:23 -0000
>@@ -25,31 +25,33 @@
> 
> exec="@sbindir@/ns-slapd"
> prog="@package_name@"
> # Lockfile
> lockfile="@localstatedir@/lock/subsys/@package_name@"
> # PID directory
> piddir="@localstatedir@/run/@package_name@"
> # Instance basedir
>-instbase="@sysconfdir@/@package_name@"
>+instbase="@instconfigdir@"
> 
> 
> [ -f $exec ] || exit 0
> 
> 
> umask 077
> 
> pids=$(pidof $exec)
> 
> INSTANCES=""
> 
> for FILE in `/bin/ls -d $instbase/slapd-* 2>/dev/null`; do
>-    INSTANCES+=$(echo "$FILE" | sed -e "s|$instbase/slapd-||")
>-    INSTANCES+=" "
>+    if [ -d "$FILE" ] ; then
>+        INSTANCES+=$(echo "$FILE" | sed -e "s|$instbase/slapd-||")
>+        INSTANCES+=" "
>+    fi
> done
> 
> if [ -n "$2" ]; then
>    for I in $INSTANCES; do
>       if [ "$2" == "$I" ]; then
>          INSTANCES="$2"
>       fi
>    done

Actions: View | Diff

Attachments on bug 227771: 147682 | 147685 | 147690 | 147916 | 147933