[Fedora-directory-commits] adminserver/admserv/cfgstuff admserv.conf.in, 1.3, 1.4 httpd-2.2.conf.in, 1.3, 1.4 httpd.conf.in, 1.3, 1.4 restart-ds-admin.in, 1.1, 1.2
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Tue May 15 16:45:47 UTC 2007
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25759/adminserver/admserv/cfgstuff
Modified Files:
admserv.conf.in httpd-2.2.conf.in httpd.conf.in
restart-ds-admin.in
Log Message:
Resolves: bug 239502
Description: adminserver: autotools, FHS, and many bug fixes
Fix Description: 1) viewlog had a couple of bugs. I also added some tests for viewlog
2) The start, stop, and restart scripts have been renamed
3) Move the cgid socket to /var/run/fedora-ds and rename to make it unique
4) Forgot the trailing slash on some of the paths in admserv.conf. I also needed to add the html directory, and fix the location match pattern matching for the command and task urls
Index: admserv.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- admserv.conf.in 15 May 2007 00:30:48 -0000 1.3
+++ admserv.conf.in 15 May 2007 16:45:44 -0000 1.4
@@ -25,13 +25,20 @@
ADMServerVersionString "@capbrand at -Administrator/@PACKAGE_VERSION@"
ADMConfigDir "@configdir@"
-ScriptAlias /bin/admin/admin/bin/ "@cgibindir@"
-ScriptAlias /dist/ "@cgibindir@"
-ScriptAlias /manual/help/ "@cgibindir@"
+ScriptAlias /bin/admin/admin/bin/ "@cgibindir@/"
+ScriptAlias /dist/ "@cgibindir@/"
+ScriptAlias /manual/help/ "@cgibindir@/"
# all access is explicitly denied by default in httpd.conf
# the following Directory directives turn on access for specific
# directories
+<Directory "@htmldir@/">
+ AllowOverride None
+ Options None
+ Order allow,deny
+ Allow from all
+</Directory>
+
<Directory "@manualdir@/">
AllowOverride None
Options None
@@ -39,7 +46,7 @@
Allow from all
</Directory>
-<Directory "@icondir@">
+<Directory "@icondir@/">
AllowOverride None
Options None
Order allow,deny
@@ -51,7 +58,7 @@
RewriteRule ^/$ /bin/admin/admin/bin/download [R,L,QSA]
# remap admin server icons
-Alias /admin-serv/tasks/icons/ @icondir@
+Alias /admin-serv/tasks/icons/ @icondir@/
# Handle the initial login
<Location /admin-serv/authenticate>
@@ -65,20 +72,7 @@
</Location>
# Handle Other Console tasks
-<LocationMatch /admin*/[tT]asks/[Oo]peration/*>
- AuthUserFile @configdir@/admpw
- AuthType basic
- AuthName "Admin Server"
- Require valid-user
- AdminSDK on
- ADMCgiBinDir @cgibindir@
- Options +ExecCGI
- Order allow,deny
- Allow from all
-</LocationMatch>
-
-# Handle Other Console tasks
-<LocationMatch /slapd*/[tT]asks/[Oo]peration/*>
+<LocationMatch /*/[tT]asks/[Oo]peration/*>
AuthUserFile @configdir@/admpw
AuthType basic
AuthName "Admin Server"
@@ -91,21 +85,7 @@
</LocationMatch>
# Handle Admin Express
-<LocationMatch /admin*/[tT]asks/[Cc]onfiguration/*>
- AuthUserFile @configdir@/admpw
- AuthType basic
- AuthName "Admin Server"
- Require valid-user
- AdminSDK on
- ADMCgiBinDir @cgibindir@
- NESCompatEnv on
- Options +ExecCGI
- Order allow,deny
- Allow from all
-</LocationMatch>
-
-# Handle Admin Express
-<LocationMatch /slapd*/[tT]asks/[Cc]onfiguration/*>
+<LocationMatch /*/[tT]asks/[Cc]onfiguration/*>
AuthUserFile @configdir@/admpw
AuthType basic
AuthName "Admin Server"
@@ -131,24 +111,7 @@
# Handle Stop, Start, Restart, Instance Creation - invoke mod_restartd
# need to add instance creation because you may want to create an instance
# of DS on a low port, and instance creation starts the instance as well
-<LocationMatch /slapd*/[tT]asks/[Oo]peration/(?i:stop|start|restart|startconfigds|create)$>
- AuthUserFile @configdir@/admpw
- AuthType basic
- AuthName "Admin Server"
- Require valid-user
-## turn off the password pipe when using mod_restartd
- AdminSDK off
- ADMCgiBinDir @cgibindir@
- Options +ExecCGI
- RetainPerms on
- Order allow,deny
- Allow from all
-</LocationMatch>
-
-# Handle Stop, Start, Restart, Instance Creation - invoke mod_restartd
-# need to add instance creation because you may want to create an instance
-# of DS on a low port, and instance creation starts the instance as well
-<LocationMatch /admin*/[tT]asks/[Oo]peration/(?i:stop|start|restart|startconfigds|create)$>
+<LocationMatch /*/[tT]asks/[Oo]peration/(?i:stop|start|restart|startconfigds|create)$>
AuthUserFile @configdir@/admpw
AuthType basic
AuthName "Admin Server"
Index: httpd-2.2.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd-2.2.conf.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- httpd-2.2.conf.in 15 May 2007 00:30:48 -0000 1.3
+++ httpd-2.2.conf.in 15 May 2007 16:45:44 -0000 1.4
@@ -392,11 +392,11 @@
# Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
# for setting UNIX socket for communicating with cgid.
#
-Scriptsock @logdir@/cgisock
+Scriptsock @piddir@/admin-serv.cgisock
</IfModule>
<IfModule mod_restartd.c>
-Scriptsock @logdir@/cgisock
+Scriptsock @piddir@/admin-serv.cgisock
</IfModule>
#
Index: httpd.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd.conf.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- httpd.conf.in 15 May 2007 00:30:48 -0000 1.3
+++ httpd.conf.in 15 May 2007 16:45:44 -0000 1.4
@@ -391,11 +391,11 @@
# Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
# for setting UNIX socket for communicating with cgid.
#
-Scriptsock @logdir@/cgisock
+Scriptsock @piddir@/admin-serv.cgisock
</IfModule>
<IfModule mod_restartd.c>
-Scriptsock @logdir@/cgisock
+Scriptsock @piddir@/admin-serv.cgisock
</IfModule>
#
Index: restart-ds-admin.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/restart-ds-admin.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- restart-ds-admin.in 11 May 2007 17:26:11 -0000 1.1
+++ restart-ds-admin.in 15 May 2007 16:45:44 -0000 1.2
@@ -21,6 +21,6 @@
# END COPYRIGHT BLOCK
- at cmdbindir@/stop-admin
+ at cmdbindir@/stop-ds-admin
sleep 3
- at cmdbindir@/start-admin
+ at cmdbindir@/start-ds-admin
More information about the Fedora-directory-commits
mailing list