- separate mod_proxy configuration.

Changed files:
    apache-httpd.conf -> 1.5
    apache-mod_proxy.conf -> 1.1
    apache.spec -> 1.83

diff --git a/apache-httpd.conf b/apache-httpd.conf
index a48cf36dcf995244d22645a6405cc958691ce858..45a0e4c3c014ba17c572d225af3c0d4f511d06f7 100644 (file)
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -869,41 +869,6 @@ ErrorDocument 503       /errordocs/503.shtml
 #      ErrorDocument 403 http://phf.apache.org/phf_abuse_log.cgi
 #</Location>
 
-#
-# Proxy Server directives. Uncomment the following lines to
-# enable the proxy server:
-#
-#<IfModule mod_proxy.c>
-#ProxyRequests On
-#
-#<Directory proxy:*>
-#      Order deny,allow
-#      Deny from all
-#      Allow from .your_domain.com
-#</Directory>
-
-#
-# Enable/disable the handling of HTTP/1.1 "Via:" headers.
-# ("Full" adds the server version; "Block" removes all outgoing Via: headers)
-# Set to one of: Off | On | Full | Block
-#
-#ProxyVia On
-
-#
-# To enable the cache as well, edit and uncomment the following lines:
-# (no cacheing without CacheRoot)
-#
-CacheRoot "/var/cache/www/apache"
-CacheSize 5
-CacheGcInterval 4
-CacheMaxExpire 24
-CacheLastModifiedFactor 0.1
-CacheDefaultExpire 1
-#NoCache a_domain.com another_domain.edu joes.garage_sale.com
-
-#</IfModule>
-# End of proxy directives.
-
 ### Section 3: Virtual Hosts
 #
 # VirtualHost: If you want to maintain multiple domains/hostnames on your

diff --git a/apache-mod_proxy.conf b/apache-mod_proxy.conf
new file mode 100644 (file)
index 0000000..cd7d435
--- /dev/null
+++ b/apache-mod_proxy.conf
@@ -0,0 +1,33 @@
+# Proxy Server directives. Uncomment the following lines to
+# enable the proxy server:
+#
+#<IfModule mod_proxy.c>
+#ProxyRequests On
+#
+#<Directory proxy:*>
+#      Order deny,allow
+#      Deny from all
+#      Allow from .your_domain.com
+#</Directory>
+
+#
+# Enable/disable the handling of HTTP/1.1 "Via:" headers.
+# ("Full" adds the server version; "Block" removes all outgoing Via: headers)
+# Set to one of: Off | On | Full | Block
+#
+#ProxyVia On
+
+#
+# To enable the cache as well, edit and uncomment the following lines:
+# (no cacheing without CacheRoot)
+#
+CacheRoot "/var/cache/www/apache"
+CacheSize 5
+CacheGcInterval 4
+CacheMaxExpire 24
+CacheLastModifiedFactor 0.1
+CacheDefaultExpire 1
+#NoCache a_domain.com another_domain.edu joes.garage_sale.com
+
+#</IfModule>
+# End of proxy directives.

diff --git a/apache.spec b/apache.spec
index 2e872a4298782eaeacc91990dcfcd919de0454a3..01b965c94ea958b8e0fd8ba65f4cfdb0c8a13e0d 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -19,6 +19,7 @@ Source6:      apache-httpd.conf
 Source7:       apache-srm.conf
 Source8:       apache-virtual-host.conf
 Source9:       apache-mod_status.conf
+Source10:      apache-mod_proxy.conf
 Patch0:                apache-PLD.patch
 Patch1:                apache-suexec.patch
 Patch2:                apache-htdocs.patch
@@ -365,6 +366,9 @@ install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/srm.conf
 install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/virtual-host.conf
 
+install %{SOURCE9}  $RPM_BUILD_ROOT%{_sysconfdir}/mod_status.conf
+install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/mod_proxy.conf
+
 ln -sf index.html.en $RPM_BUILD_ROOT/home/httpd/html/index.html
 
 strip --strip-unneeded $RPM_BUILD_ROOT%{_libexecdir}/*.so
@@ -787,6 +791,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(644,root,root) %{_datadir}/manual/mod/mod_info.html
 
 %files mod_proxy
+%config(noreplace) %{_sysconfdir}/mod_proxy.conf
 %attr(755,root,root) %{_libexecdir}/libproxy.so
 %attr(644,root,root) %{_datadir}/manual/mod/mod_proxy.html
 %dir %attr(750,http,http) /var/cache/apache
@@ -796,6 +801,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(644,root,root) %{_datadir}/manual/mod/mod_rewrite.html
 
 %files mod_status
+%config(noreplace) %{_sysconfdir}/mod_status.conf
 %attr(755,root,root) %{_libexecdir}/mod_status.so
 %attr(644,root,root) %{_datadir}/manual/mod/mod_status.html