[Fedora-directory-commits] adminserver/admserv/cfgstuff httpd-2.2.conf.in, 1.4, 1.5 httpd.conf.in, 1.4, 1.5 start-ds-admin.in, 1.1, 1.2

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18539/adminserver/admserv/cfgstuff

Modified Files:
	httpd-2.2.conf.in httpd.conf.in start-ds-admin.in 
Log Message:
Resolves: bug 239502
Description: adminserver: autotools, FHS, and many bug fixes
Fix Description: 1) Fixes for RHEL5 and Apache 2.2 - the existing code for handling Apache 2.2 did not work, including cgisock code in httpd.conf
2) better support for mod_nss detection - look in several places for pcache and module
3) admin server post install will mkdirs that it uses if they do not already exist, and set permissions appropriately
4) use --variable=libdir with nss pkg-config to get the libdir - --libs-only-L returns nothing if the library is already in the system libdir - we need the actual libdir in every case because we have to use it in the ld_preload in the startup script



Index: httpd-2.2.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd-2.2.conf.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httpd-2.2.conf.in	15 May 2007 16:45:44 -0000	1.4
+++ httpd-2.2.conf.in	21 May 2007 15:52:26 -0000	1.5
@@ -395,9 +395,8 @@
 Scriptsock            @piddir@/admin-serv.cgisock
 </IfModule>
 
-<IfModule mod_restartd.c>
+# and this one is for mod_restartd because mod_cgid will consume the other one
 Scriptsock            @piddir@/admin-serv.cgisock
-</IfModule>
 
 #
 # Redirect allows you to tell clients about documents which used to exist in


Index: httpd.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd.conf.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httpd.conf.in	15 May 2007 16:45:44 -0000	1.4
+++ httpd.conf.in	21 May 2007 15:52:26 -0000	1.5
@@ -394,9 +394,8 @@
 Scriptsock            @piddir@/admin-serv.cgisock
 </IfModule>
 
-<IfModule mod_restartd.c>
+# and this one is for mod_restartd because mod_cgid will consume the other one
 Scriptsock            @piddir@/admin-serv.cgisock
-</IfModule>
 
 #
 # Redirect allows you to tell clients about documents which used to exist in


Index: start-ds-admin.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/start-ds-admin.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- start-ds-admin.in	11 May 2007 17:26:11 -0000	1.1
+++ start-ds-admin.in	21 May 2007 15:52:26 -0000	1.2
@@ -41,7 +41,12 @@
     /usr/bin/ldd $HTTPD 2>&1 | grep libldap > /dev/null 2>&1 && hasol=1
 
     if [ $hasol -eq 1 ] ; then
-        LD_PRELOAD="@nss_libdir@/libssl3.so @ldapsdk_libdir@/libldap60.so"
+        nss_libdir="@nss_libdir@"
+        if [ -n "$nss_libdir" ] ; then
+            LD_PRELOAD="$nss_libdir/libssl3.so @ldapsdk_libdir@/libldap60.so"
+        else
+            LD_PRELOAD="@ldapsdk_libdir@/libldap60.so"
+        fi
         export LD_PRELOAD
     fi
 fi