[Fedora-directory-commits] adminserver/admserv/cfgstuff admserv.conf, 1.8, 1.9 httpd.conf, 1.5, 1.6

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	admserv.conf httpd.conf 
Log Message:
Bug(s) fixed: 172402
Bug Description: Add support for mod_restartd - remove Apache module 
packaging
Reviewed by: Noriko (Thanks!)
Fix Description: Add support for mod_restartd to the Admin Server 
httpd.conf and admserv.conf.  This just allows root to run the stop, 
start, and restart CGIs.  In addition to the regex in admserv.conf that 
restricts CGI access, the code in mod_restartd itself restricts CGIs to 
only those matching this pattern - all others get passed on to the 
regular CGI handling module.  Since our 3 Apache modules are all Apache 
licensed, they cannot be included in our rpm/tarball packaging for 
distribution.  They will have to be separate rpms/tarballs that the 
customer will have to download and install.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no



Index: admserv.conf
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- admserv.conf	28 Oct 2005 22:43:23 -0000	1.8
+++ admserv.conf	3 Nov 2005 23:20:49 -0000	1.9
@@ -71,7 +71,7 @@
     Require valid-user
 </Location>
 
-# Handle Console tasks
+# Handle Other Console tasks
 <LocationMatch /*/[tT]asks/[Oo]peration/*>
   AuthUserFile %%%sroot%%%/admin-serv/config/admpw
   AuthType basic
@@ -98,3 +98,15 @@
   AuthName "Admin Server"
   Require valid-user
 </LocationMatch>
+
+# Handle Stop, Start, Restart - invoke mod_restartd
+<LocationMatch /*/[tT]asks/[Oo]peration/(?i:stop|start|restart|startconfigds)$>
+  AuthUserFile /home/rich/72srv/admin-serv/config/admpw
+  AuthType basic
+  AuthName "Admin Server"
+  Require valid-user
+## turn off the password pipe when using mod_restartd
+  AdminSDK off
+  Options +ExecCGI
+  RetainPerms on
+</LocationMatch>


Index: httpd.conf
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- httpd.conf	18 Aug 2005 18:58:18 -0000	1.5
+++ httpd.conf	3 Nov 2005 23:20:49 -0000	1.6
@@ -147,6 +147,7 @@
 LoadModule file_cache_module %%%module_dir%%%/modules/mod_file_cache.so
 LoadModule mem_cache_module %%%module_dir%%%/modules/mod_mem_cache.so
 LoadModule cgi_module %%%module_dir%%%/modules/mod_cgi.so
+LoadModule restartd_module     %%%sroot%%%/bin/admin/lib/libmodrestartd.so
 LoadModule admserv_module     %%%sroot%%%/bin/admin/lib/libmodadmserv.so
 LoadModule nss_module         %%%sroot%%%/bin/admin/lib/libmodnss.so