[Fedora-directory-commits] adminserver/admserv/cfgstuff admserv.conf.in, 1.1, 1.2 httpd-2.2.conf.in, 1.1, 1.2 httpd.conf.in, 1.1, 1.2
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Fri May 11 19:44:07 UTC 2007
- Previous message (by thread): [Fedora-directory-commits] adminserver/admserv/cgi-src40 ReadLog.c, 1.6, 1.7 admpw.c, 1.8, 1.9 config.c, 1.8, 1.9 dsconfig.c, 1.7, 1.8 getport.c, 1.5, 1.6 htmladmin.c, 1.8, 1.9 mergeConfig.cpp, 1.6, 1.7 migrateConfig.c, 1.6, 1.7 restartsrv.c, 1.6, 1.7 sec-activate.c, 1.8, 1.9 security.c, 1.9, 1.10 setport.c, 1.5, 1.6 start_config_ds.c, 1.6, 1.7 ugdsconfig.c, 1.7, 1.8 viewdata.c, 1.7, 1.8 viewlog.c, 1.6, 1.7
- Next message (by thread): [Fedora-directory-commits] adminserver Makefile.am, 1.1, 1.2 Makefile.in, 1.1, 1.2 aclocal.m4, 1.1, 1.2 configure, 1.1, 1.2 configure.ac, 1.1, 1.2 ltmain.sh, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24035/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: Many more changes to make admin server more FHS friendly
Allow all hardcoded paths to writable directories to be overridden by environment variables
Integrate mod_admserv and mod_restartd
Allow Admin Server to use Fortitude or standalone mod_nss
Better httpd detection and support
Index: admserv.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- admserv.conf.in 9 May 2007 00:26:30 -0000 1.1
+++ admserv.conf.in 11 May 2007 19:44:05 -0000 1.2
@@ -23,6 +23,7 @@
ADMCacheLifeTime 600
ADMServerVersionString "@brand at -Administrator/@PACKAGE_VERSION@"
+ADMConfigDir "@configdir@"
ScriptAlias /bin/admin/admin/bin/ "@cgibindir@"
ScriptAlias /dist/ "@cgibindir@"
Index: httpd-2.2.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd-2.2.conf.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd-2.2.conf.in 9 May 2007 00:26:30 -0000 1.1
+++ httpd-2.2.conf.in 11 May 2007 19:44:05 -0000 1.2
@@ -117,32 +117,32 @@
#
# Example:
# LoadModule foo_module modules/mod_foo.so
-LoadModule authz_host_module @moddir@/modules/mod_authz_host.so
-LoadModule auth_basic_module @moddir@/modules/mod_auth_basic.so
-LoadModule authn_file_module @moddir@/modules/mod_authn_file.so
-LoadModule log_config_module @moddir@/modules/mod_log_config.so
-LoadModule env_module @moddir@/modules/mod_env.so
-LoadModule mime_magic_module @moddir@/modules/mod_mime_magic.so
-LoadModule expires_module @moddir@/modules/mod_expires.so
-LoadModule deflate_module @moddir@/modules/mod_deflate.so
-LoadModule headers_module @moddir@/modules/mod_headers.so
-LoadModule unique_id_module @moddir@/modules/mod_unique_id.so
-LoadModule setenvif_module @moddir@/modules/mod_setenvif.so
-LoadModule mime_module @moddir@/modules/mod_mime.so
-LoadModule vhost_alias_module @moddir@/modules/mod_vhost_alias.so
-LoadModule negotiation_module @moddir@/modules/mod_negotiation.so
-LoadModule dir_module @moddir@/modules/mod_dir.so
-LoadModule actions_module @moddir@/modules/mod_actions.so
-LoadModule alias_module @moddir@/modules/mod_alias.so
-LoadModule rewrite_module @moddir@/modules/mod_rewrite.so
-LoadModule cache_module @moddir@/modules/mod_cache.so
-LoadModule disk_cache_module @moddir@/modules/mod_disk_cache.so
-LoadModule file_cache_module @moddir@/modules/mod_file_cache.so
-LoadModule mem_cache_module @moddir@/modules/mod_mem_cache.so
-LoadModule cgi_module @moddir@/modules/mod_cgi.so
-LoadModule restartd_module @moddir@/libmodrestartd.so
-LoadModule nss_module @moddir@/libmodnss.so
-LoadModule admserv_module @moddir@/libmodadmserv.so
+LoadModule authz_host_module @moddir@/mod_authz_host.so
+LoadModule auth_basic_module @moddir@/mod_auth_basic.so
+LoadModule authn_file_module @moddir@/mod_authn_file.so
+LoadModule log_config_module @moddir@/mod_log_config.so
+LoadModule env_module @moddir@/mod_env.so
+LoadModule mime_magic_module @moddir@/mod_mime_magic.so
+LoadModule expires_module @moddir@/mod_expires.so
+LoadModule deflate_module @moddir@/mod_deflate.so
+LoadModule headers_module @moddir@/mod_headers.so
+LoadModule unique_id_module @moddir@/mod_unique_id.so
+LoadModule setenvif_module @moddir@/mod_setenvif.so
+LoadModule mime_module @moddir@/mod_mime.so
+LoadModule vhost_alias_module @moddir@/mod_vhost_alias.so
+LoadModule negotiation_module @moddir@/mod_negotiation.so
+LoadModule dir_module @moddir@/mod_dir.so
+LoadModule actions_module @moddir@/mod_actions.so
+LoadModule alias_module @moddir@/mod_alias.so
+LoadModule rewrite_module @moddir@/mod_rewrite.so
+LoadModule cache_module @moddir@/mod_cache.so
+LoadModule disk_cache_module @moddir@/mod_disk_cache.so
+LoadModule file_cache_module @moddir@/mod_file_cache.so
+LoadModule mem_cache_module @moddir@/mod_mem_cache.so
+LoadModule cgi_module @moddir@/mod_cgi.so
+LoadModule restartd_module @admmoddir@/mod_restartd.so
+LoadModule nss_module @nssmoddir@/libmodnss.so
+LoadModule admserv_module @admmoddir@/mod_admserv.so
### Section 2: 'Main' server configuration
#
@@ -297,7 +297,7 @@
# directive tells the module where the hint definitions are located.
#
<IfModule mod_mime_magic.c>
- MIMEMagicFile @moddir@/conf/magic
+ MIMEMagicFile @mimemagic@
</IfModule>
#
Index: httpd.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd.conf.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd.conf.in 9 May 2007 00:26:30 -0000 1.1
+++ httpd.conf.in 11 May 2007 19:44:05 -0000 1.2
@@ -117,31 +117,31 @@
#
# Example:
# LoadModule foo_module modules/mod_foo.so
-LoadModule access_module @moddir@/modules/mod_access.so
-LoadModule auth_module @moddir@/modules/mod_auth.so
-LoadModule log_config_module @moddir@/modules/mod_log_config.so
-LoadModule env_module @moddir@/modules/mod_env.so
-LoadModule mime_magic_module @moddir@/modules/mod_mime_magic.so
-LoadModule expires_module @moddir@/modules/mod_expires.so
-LoadModule deflate_module @moddir@/modules/mod_deflate.so
-LoadModule headers_module @moddir@/modules/mod_headers.so
-LoadModule unique_id_module @moddir@/modules/mod_unique_id.so
-LoadModule setenvif_module @moddir@/modules/mod_setenvif.so
-LoadModule mime_module @moddir@/modules/mod_mime.so
-LoadModule vhost_alias_module @moddir@/modules/mod_vhost_alias.so
-LoadModule negotiation_module @moddir@/modules/mod_negotiation.so
-LoadModule dir_module @moddir@/modules/mod_dir.so
-LoadModule actions_module @moddir@/modules/mod_actions.so
-LoadModule alias_module @moddir@/modules/mod_alias.so
-LoadModule rewrite_module @moddir@/modules/mod_rewrite.so
-LoadModule cache_module @moddir@/modules/mod_cache.so
-LoadModule disk_cache_module @moddir@/modules/mod_disk_cache.so
-LoadModule file_cache_module @moddir@/modules/mod_file_cache.so
-LoadModule mem_cache_module @moddir@/modules/mod_mem_cache.so
-LoadModule cgi_module @moddir@/modules/mod_cgi.so
-LoadModule restartd_module @moddir@/libmodrestartd.so
-LoadModule nss_module @moddir@/libmodnss.so
-LoadModule admserv_module @moddir@/libmodadmserv.so
+LoadModule access_module @moddir@/mod_access.so
+LoadModule auth_module @moddir@/mod_auth.so
+LoadModule log_config_module @moddir@/mod_log_config.so
+LoadModule env_module @moddir@/mod_env.so
+LoadModule mime_magic_module @moddir@/mod_mime_magic.so
+LoadModule expires_module @moddir@/mod_expires.so
+LoadModule deflate_module @moddir@/mod_deflate.so
+LoadModule headers_module @moddir@/mod_headers.so
+LoadModule unique_id_module @moddir@/mod_unique_id.so
+LoadModule setenvif_module @moddir@/mod_setenvif.so
+LoadModule mime_module @moddir@/mod_mime.so
+LoadModule vhost_alias_module @moddir@/mod_vhost_alias.so
+LoadModule negotiation_module @moddir@/mod_negotiation.so
+LoadModule dir_module @moddir@/mod_dir.so
+LoadModule actions_module @moddir@/mod_actions.so
+LoadModule alias_module @moddir@/mod_alias.so
+LoadModule rewrite_module @moddir@/mod_rewrite.so
+LoadModule cache_module @moddir@/mod_cache.so
+LoadModule disk_cache_module @moddir@/mod_disk_cache.so
+LoadModule file_cache_module @moddir@/mod_file_cache.so
+LoadModule mem_cache_module @moddir@/mod_mem_cache.so
+LoadModule cgi_module @moddir@/mod_cgi.so
+LoadModule restartd_module @admmoddir@/mod_restartd.so
+LoadModule nss_module @nssmoddir@/libmodnss.so
+LoadModule admserv_module @admmoddir@/mod_admserv.so
### Section 2: 'Main' server configuration
#
@@ -296,7 +296,7 @@
# directive tells the module where the hint definitions are located.
#
<IfModule mod_mime_magic.c>
- MIMEMagicFile @moddir@/conf/magic
+ MIMEMagicFile @mimemagic@
</IfModule>
#
- Previous message (by thread): [Fedora-directory-commits] adminserver/admserv/cgi-src40 ReadLog.c, 1.6, 1.7 admpw.c, 1.8, 1.9 config.c, 1.8, 1.9 dsconfig.c, 1.7, 1.8 getport.c, 1.5, 1.6 htmladmin.c, 1.8, 1.9 mergeConfig.cpp, 1.6, 1.7 migrateConfig.c, 1.6, 1.7 restartsrv.c, 1.6, 1.7 sec-activate.c, 1.8, 1.9 security.c, 1.9, 1.10 setport.c, 1.5, 1.6 start_config_ds.c, 1.6, 1.7 ugdsconfig.c, 1.7, 1.8 viewdata.c, 1.7, 1.8 viewlog.c, 1.6, 1.7
- Next message (by thread): [Fedora-directory-commits] adminserver Makefile.am, 1.1, 1.2 Makefile.in, 1.1, 1.2 aclocal.m4, 1.1, 1.2 configure, 1.1, 1.2 configure.ac, 1.1, 1.2 ltmain.sh, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Fedora-directory-commits
mailing list