Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24009/adminserver/admserv/cfgstuff
Modified Files:
admserv.conf.in httpd-2.2.conf.in httpd.conf.in
Log Message:
Resolves: bug 239502
Description: adminserver: autotools, FHS, and many bug fixes
Fix Description: 1) Added the admin.inf file, which contains information about the brand,
product name, vendor, build number, and other information. This gets put in an inf/
subdir of the ds datadir. The update program reads this information and updates the info
in the ISIE and SIE entries. This allows us to remove some of the branded code.
2) We need to set the cgisock path for mod_cgid and mod_restartd.
3) The update program needs to modify some http style conf file parameters. The config
CGI program already does this. I modified the config CGI program so that it could be run
from the command line and modify the parameters that the update program needs.
4) Removed lots of dead code from ux-update.cc. The way it works now is that the config
files are generated at build time, not at install time, so a lot of that logic could be
removed. We still need to update a few parameters at install time - see 3 above.
5) User can specify configdir, securitydir, logdir, and piddir in the setup.inf file at
install time, or can specify environment variables for those, or it will just use the
hardcoded values set at build time. This makes it work like the ds instance creation
code.
Index: admserv.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- admserv.conf.in 11 May 2007 19:44:05 -0000 1.2
+++ admserv.conf.in 15 May 2007 00:30:48 -0000 1.3
@@ -22,7 +22,7 @@
# apache, either directly or thru an Include /path/to/this.conf
ADMCacheLifeTime 600
-ADMServerVersionString "@brand@-Administrator/@PACKAGE_VERSION@"
+ADMServerVersionString "@capbrand@-Administrator/@PACKAGE_VERSION@"
ADMConfigDir "@configdir@"
ScriptAlias /bin/admin/admin/bin/ "@cgibindir@"
Index: httpd-2.2.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd-2.2.conf.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- httpd-2.2.conf.in 11 May 2007 19:44:05 -0000 1.2
+++ httpd-2.2.conf.in 15 May 2007 00:30:48 -0000 1.3
@@ -392,7 +392,11 @@
# Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
# for setting UNIX socket for communicating with cgid.
#
-#Scriptsock logs/cgisock
+Scriptsock @logdir@/cgisock
+</IfModule>
+
+<IfModule mod_restartd.c>
+Scriptsock @logdir@/cgisock
</IfModule>
#
Index: httpd.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd.conf.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- httpd.conf.in 11 May 2007 19:44:05 -0000 1.2
+++ httpd.conf.in 15 May 2007 00:30:48 -0000 1.3
@@ -391,7 +391,11 @@
# Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
# for setting UNIX socket for communicating with cgid.
#
-#Scriptsock logs/cgisock
+Scriptsock @logdir@/cgisock
+</IfModule>
+
+<IfModule mod_restartd.c>
+Scriptsock @logdir@/cgisock
</IfModule>
#
Show replies by date