- updated

Changed files:
    apache-mod_dir.conf -> 1.7
    apache-mod_proxy.conf -> 1.7

diff --git a/apache-mod_dir.conf b/apache-mod_dir.conf
index 754b634cfef6d2e2a5281e63fdad7db74e81b434..f92672b5fc7a0d7266c07c3fe5787d268671707c 100644 (file)
--- a/apache-mod_dir.conf
+++ b/apache-mod_dir.conf
@@ -1,7 +1,10 @@
 # $Id$
 LoadModule dir_module           modules/mod_dir.so
 
-<IfModule mod_dir.c>
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+
+<IfModule dir_module>
        DirectoryIndex index.html index.html.var index.htm index.shtml index.cgi index.php index.aspx
 </IfModule>
 

diff --git a/apache-mod_proxy.conf b/apache-mod_proxy.conf
index 98144d462e677daa48c1c0a17fe60563a86d737e..1837c6cc7212f27cf6a43d20ada5102130a27197 100644 (file)
--- a/apache-mod_proxy.conf
+++ b/apache-mod_proxy.conf
@@ -1,14 +1,18 @@
 # $Id$
-LoadModule proxy_module         modules/mod_proxy.so
-LoadModule proxy_connect_module modules/mod_proxy_connect.so
-LoadModule proxy_ftp_module     modules/mod_proxy_ftp.so
-LoadModule proxy_http_module    modules/mod_proxy_http.so
+LoadModule proxy_module             modules/mod_proxy.so
+
+# FIXME: enable or disable these by default?
+# I'd enable if the config is secure. but i'm not sure
+#LoadModule proxy_connect_module     modules/mod_proxy_connect.so
+#LoadModule proxy_ftp_module         modules/mod_proxy_ftp.so
+#LoadModule proxy_http_module        modules/mod_proxy_http.so
+#LoadModule proxy_ajp_module         modules/mod_proxy_ajp.so
+#LoadModule proxy_balancer_module    modules/mod_proxy_balancer.so
 
-#
 # Proxy Server directives. Uncomment the following lines to
 # enable the proxy server:
 #
-<IfModule mod_proxy.c>
+<IfModule proxy_module>
 ProxyRequests On
 #
 #
@@ -28,21 +32,8 @@ ProxyRequests On
 #
 ProxyVia On
 
-#
-# To enable the cache as well, edit and uncomment the following lines:
-# (no cacheing without CacheRoot)
-#
-<IfModule mod_cache.c>
-CacheRoot "/var/cache/apache"
-CacheSize 5
-CacheGcInterval 4
-CacheMaxExpire 24
-CacheLastModifiedFactor 0.1
-CacheDefaultExpire 1
-#NoCache a-domain.com another-domain.edu joes.garage-sale.com
-</IfModule>
+# To enable the cache as well, see mod_cache.conf
 
 </IfModule>
-# End of proxy directives.
 
 # vim: filetype=apache ts=4 sw=4 et