[Fedora-directory-commits] adminserver/admserv/cfgstuff adminserver-httpd-moduleorder.patch, 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-serv25486

Modified Files:
	adminserver-httpd-moduleorder.patch 
Log Message:
replace %%% tokens with the real default paths, otherwise patch won't work


adminserver-httpd-moduleorder.patch:

Index: adminserver-httpd-moduleorder.patch
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/adminserver-httpd-moduleorder.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- adminserver-httpd-moduleorder.patch	23 Feb 2006 01:12:11 -0000	1.1
+++ adminserver-httpd-moduleorder.patch	23 Feb 2006 01:50:30 -0000	1.2
@@ -1,17 +1,17 @@
 --- admin-serv/config/httpd.conf	7 Dec 2005 20:46:06 -0000	1.7
 +++ admin-serv/config/httpd.conf	18 Jan 2006 16:58:37 -0000	1.8
 @@ -143,18 +143,18 @@
- LoadModule alias_module %%%module_dir%%%/modules/mod_alias.so
- LoadModule rewrite_module %%%module_dir%%%/modules/mod_rewrite.so
- LoadModule cache_module %%%module_dir%%%/modules/mod_cache.so
- LoadModule disk_cache_module %%%module_dir%%%/modules/mod_disk_cache.so
- 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
-+LoadModule admserv_module     %%%sroot%%%/bin/admin/lib/libmodadmserv.so
+ LoadModule alias_module /etc/httpd/modules/mod_alias.so
+ LoadModule rewrite_module /etc/httpd/modules/mod_rewrite.so
+ LoadModule cache_module /etc/httpd/modules/mod_cache.so
+ LoadModule disk_cache_module /etc/httpd/modules/mod_disk_cache.so
+ LoadModule file_cache_module /etc/httpd/modules/mod_file_cache.so
+ LoadModule mem_cache_module /etc/httpd/modules/mod_mem_cache.so
+ LoadModule cgi_module /etc/httpd/modules/mod_cgi.so
+ LoadModule restartd_module     /opt/fedora-ds/bin/admin/lib/libmodrestartd.so
+-LoadModule admserv_module     /opt/fedora-ds/bin/admin/lib/libmodadmserv.so
+ LoadModule nss_module         /opt/fedora-ds/bin/admin/lib/libmodnss.so
++LoadModule admserv_module     /opt/fedora-ds/bin/admin/lib/libmodadmserv.so
  
  ### Section 2: 'Main' server configuration
  #