Attachment 218121 Details for Bug 248169 – diffs - adminserver

[patch] diffs - adminserver

cvsdiffs (text/plain), 6.96 KB, created by Rich Megginson on 2007-10-05 22:24:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-10-05 22:24:57 UTC

Size: 6.96 KB

patch

obsolete

>Index: adminserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/adminserver/Makefile.am,v
>retrieving revision 1.33
>diff -u -8 -r1.33 Makefile.am
>--- adminserver/Makefile.am	5 Sep 2007 16:45:58 -0000	1.33
>+++ adminserver/Makefile.am	5 Oct 2007 22:04:38 -0000
>@@ -63,16 +63,17 @@
> moddir = @moddir@
> propertydir = $(datadir)@propertydir@
> htmldir = $(datadir)@htmldir@
> icondir = $(datadir)@icondir@
> httpdconf = @httpdconf@
> manualdir = $(datadir)@manualdir@
> helpdir = $(manualdir)/help
> initdir = $(sysconfdir)@initdir@
>+initconfigdir = $(sysconfdir)@initconfigdir@
> instconfigdir = @instconfigdir@
> instancename = @instancename@
> configdir = $(instconfigdir)/$(instancename)
> # same as configdir for now
> securitydir = $(configdir)
> piddir = $(localstatedir)@piddir@
> pidfile = @pidfile@
> HTTPD = @HTTPD@
>@@ -141,16 +142,18 @@
> if CXXLINK_REQUIRED
> MYLINK = $(CXXLINK)
> else
> MYLINK = $(LINK)
> endif
> 
> init_SCRIPTS = wrappers/$(PACKAGE_NAME)
> 
>+initconfig_SCRIPTS = admserv/cfgstuff/$(PACKAGE_NAME)
>+
> ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \
> 	admserv/schema/ldif/01nsroot.ldif.tmpl \
> 	admserv/schema/ldif/02globalpreferences.ldif.tmpl \
> 	admserv/schema/ldif/10dsdata.ldif.tmpl \
> 	admserv/schema/ldif/10rm_dsdata.ldif.tmpl \
> 	admserv/schema/ldif/11dstasks.ldif.tmpl \
> 	admserv/schema/ldif/12dsconfig.mod.tmpl \
> 	admserv/schema/ldif/13dsschema.mod.tmpl \
>@@ -485,17 +488,18 @@
>         -e 's,@helpdir\@,$(helpdir),g' \
>         -e 's,@mimemagic\@,$(mimemagic),g' \
>         -e 's,@initdir\@,$(initdir),g' \
>         -e 's,@perlpath\@,$(perlpath),g' \
>         -e 's,@perlexec\@,@perlexec@,g' \
>         -e 's,@infdir\@,$(infdir),g' \
>         -e 's,@dslibdir\@,$(dslibdir),g' \
>         -e 's,@ldifdir\@,$(ldifdir),g' \
>-        -e 's,@adminutilpath\@,$(adminutilpath),g'
>+        -e 's,@adminutilpath\@,$(adminutilpath),g' \
>+        -e 's,@initconfigdir\@,$(initconfigdir),g'
> else
> fixupcmd = sed \
> 	-e 's,@ECHO_C\@,$(ECHO_C),g' \
> 	-e 's,@ECHO_N\@,$(ECHO_N),g' \
> 	-e 's,@HTTPD\@,$(HTTPD),g' \
> 	-e 's,@bindir\@,$(bindir),g' \
> 	-e 's,@sbindir\@,$(sbindir),g' \
> 	-e 's,@localstatedir\@,$(localstatedir),g' \
>@@ -535,23 +539,28 @@
> 	-e 's,@helpdir\@,$(helpdir),g' \
> 	-e 's,@mimemagic\@,$(mimemagic),g' \
> 	-e 's,@initdir\@,$(initdir),g' \
> 	-e 's,@perlpath\@,$(perlpath),g' \
> 	-e 's,@perlexec\@,@perlexec@,g' \
> 	-e 's,@infdir\@,$(infdir),g' \
> 	-e 's,@dslibdir\@,$(dslibdir),g' \
> 	-e 's,@ldifdir\@,$(ldifdir),g' \
>-	-e 's,@adminutilpath\@,$(adminutilpath),g'
>+	-e 's,@adminutilpath\@,$(adminutilpath),g' \
>+	-e 's,@initconfigdir\@,$(initconfigdir),g'
> endif
> 
> # because the source may be either httpd.conf.in or httpd-2.2.conf.in
> admserv/cfgstuff/httpd.conf: $(HTTPD_CONF_SRC)
> 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
> 	$(fixupcmd) $< > $@
> 
> % : %.in
> 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
> 	$(fixupcmd) $< > $@
> 
> %/$(PACKAGE_NAME): %/initscript.in
> 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
> 	$(fixupcmd) $^ > $@
>+
>+%/$(PACKAGE_NAME): %/initconfig.in
>+	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
>+	$(fixupcmd) $^ > $@
>Index: adminserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/adminserver/configure.ac,v
>retrieving revision 1.21
>diff -u -8 -r1.21 configure.ac
>--- adminserver/configure.ac	27 Sep 2007 16:57:08 -0000	1.21
>+++ adminserver/configure.ac	5 Oct 2007 22:04:38 -0000
>@@ -136,32 +136,34 @@
>     AC_DEFINE([OS_hpux], [1], [OS HP-UX])
>     AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision])
>     AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace])
>     # assume 64 bit
>     perlexec='/opt/perl_64/bin/perl'
>     CXXLINK_REQUIRED=1
>     httpdgroup=nogroup
>     platform="hpux"
>+    initconfigdir="/$PACKAGE_NAME/config"
> 	;;
>   hppa*-hp-hpux*)
>     AC_DEFINE([XP_UNIX], [1], [UNIX])
>     AC_DEFINE([hpux], [1], [HP-UX])
>     AC_DEFINE([HPUX], [1], [HP-UX])
>     AC_DEFINE([HPUX11], [1], [HP-UX 11])
>     AC_DEFINE([HPUX11_11], [1], [HP-UX 11.11])
>     AC_DEFINE([CPU_hppa], [], [cpu type pa-risc])
>     AC_DEFINE([OS_hpux], [1], [OS HP-UX])
>     AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision])
>     AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace])
>     CXXLINK_REQUIRED=1
>     httpdgroup=nogroup
>     # assume 64 bit
>     perlexec='/opt/perl_64/bin/perl'
>     platform="hpux"
>+    initconfigdir="/$PACKAGE_NAME/config"
> 	;;
>   sparc-sun-solaris*)
>     AC_DEFINE([XP_UNIX], [1], [UNIX])
>     AC_DEFINE([SVR4], [1], [SVR4])
>     AC_DEFINE([__svr4], [1], [SVR4])
>     AC_DEFINE([__svr4__], [1], [SVR4])
>     AC_DEFINE([_SVID_GETTOD], [1], [SVID_GETTOD])
>     AC_DEFINE([CPU_sparc], [], [cpu type sparc])
>@@ -189,16 +191,29 @@
>   *)
> esac
> AC_SUBST(initdir)
> AC_SUBST(perlexec)
> AM_CONDITIONAL([CXXLINK_REQUIRED], test "$CXXLINK_REQUIRED" = 1)
> AM_CONDITIONAL([HPUX],test "$platform" = "hpux")
> AM_CONDITIONAL([SOLARIS],test "$platform" = "solaris")
> 
>+# set default initconfigdir if not already set
>+# value will be set so as to be relative to $(sysconfdir)
>+if test -z "$initconfigdir" ; then
>+   if test -d /etc/sysconfig ; then
>+      initconfigdir=/sysconfig
>+   elif test -d /etc/default ; then
>+      initconfigdir=/default
>+   else
>+      initconfigdir="/$PACKAGE_NAME/config"
>+   fi
>+fi
>+AC_SUBST(initconfigdir)
>+
> # Check for fortitude
> m4_include(m4/fortitude.m4)
> # Check for web server
> m4_include(m4/httpd.m4)
> 
> # Check for library dependencies
> m4_include(m4/nspr.m4)
> m4_include(m4/nss.m4)
>Index: adminserver/admserv/cfgstuff/start-ds-admin.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/start-ds-admin.in,v
>retrieving revision 1.3
>diff -u -8 -r1.3 start-ds-admin.in
>--- adminserver/admserv/cfgstuff/start-ds-admin.in	1 Aug 2007 18:14:53 -0000	1.3
>+++ adminserver/admserv/cfgstuff/start-ds-admin.in	5 Oct 2007 22:04:38 -0000
>@@ -51,9 +51,12 @@
>     fi
> fi
> 
> # mod_deflate is not supported on HP-UX using the /opt/hpws apache
> if [ $OS = "HP-UX" ] ; then
>     OMIT_DEFLATE="-DOmitDeflate"
> fi
> 
>+# source env. for admin server
>+[ -f @initconfigdir@/@package_name@ ] && . @initconfigdir@/@package_name@
>+
> $HTTPD $OMIT_DEFLATE -k start -f @configdir@/httpd.conf "$@"
>Index: adminserver/wrappers/initscript.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/wrappers/initscript.in,v
>retrieving revision 1.1
>diff -u -8 -r1.1 initscript.in
>--- adminserver/wrappers/initscript.in	15 Jun 2007 17:13:02 -0000	1.1
>+++ adminserver/wrappers/initscript.in	5 Oct 2007 22:04:38 -0000
>@@ -87,16 +87,18 @@
> piddir="@localstatedir@/run/@PACKAGE_BASE_NAME@"
> # PID file
> pidfile=$piddir/admin-serv.pid
> 
> [ -f $exec ] || exit 0
> 
> umask 077
> 
>+[ -f @initconfigdir@/@package_name@ ] && . @initconfigdir@/@package_name@
>+
> start() {
>     if [ ! -f $start_script ]; then
>         echo_n "*** Error: $start_script does not exist"
>         failure; echo
>         exit 1
>     fi
>     echo  "Starting $prog: "
>     # Start every slapd instance that isn't already running

Actions: View | Diff

Attachments on bug 248169: 159210 | 217951 | 217961 | 218031 | 218041 | 218101 | 218121 | 218201 | 218211