- apache2

Changed files:
    apache-mod_proxy.conf -> 1.2
    apache.init -> 1.12

diff --git a/apache-mod_proxy.conf b/apache-mod_proxy.conf
index cd7d435f34a533e18d903e7682e38c18cb01802b..f1210f8a462716fe511ab6ce58b10c4679703c6a 100644 (file)
--- a/apache-mod_proxy.conf
+++ b/apache-mod_proxy.conf
@@ -1,33 +1,40 @@
+LoadModule proxy_module         lib/apache/mod_proxy.so
+LoadModule proxy_connect_module lib/apache/mod_proxy_connect.so
+LoadModule proxy_ftp_module     lib/apache/mod_proxy_ftp.so
+LoadModule proxy_http_module    lib/apache/mod_proxy_http.so
+
+#
 # Proxy Server directives. Uncomment the following lines to
 # enable the proxy server:
 #
-#<IfModule mod_proxy.c>
-#ProxyRequests On
+<IfModule mod_proxy.c>
+ProxyRequests On
 #
-#<Directory proxy:*>
-#      Order deny,allow
-#      Deny from all
-#      Allow from .your_domain.com
-#</Directory>
+#<Proxy *>
+#    Order deny,allow
+#    Deny from all
+#    Allow from .your-domain.com
+#</Proxy>
 
 #
 # 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
+ProxyVia On
 
 #
 # To enable the cache as well, edit and uncomment the following lines:
 # (no cacheing without CacheRoot)
 #
-CacheRoot "/var/cache/www/apache"
+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
+#NoCache a-domain.com another-domain.edu joes.garage-sale.com
 
-#</IfModule>
+</IfModule>
 # End of proxy directives.
+

diff --git a/apache.init b/apache.init
index 0432b79a7725dffdd4d6f4521d69ce8b6f11622e..ab6650488f31990a964c134e24fdd8daa43183c1 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -7,7 +7,9 @@
 #              HTML files and CGI.
 # processname: httpd
 # pidfile:     /var/run/httpd.pid
-# config:      /etc/httpd/httpd.conf
+# config:      /etc/httpd/conf/access.conf
+# config:      /etc/httpd/conf/httpd.conf
+# config:      /etc/httpd/conf/srm.conf
 
 
 # Source function library
@@ -26,10 +28,6 @@ if is_no "${NETWORKING}"; then
         exit 1
 fi
 
-if is_no "${IPV6_NETWORKING}"; then
-        HTTPD_OPTS="$HTTPD_OPTS -4"
-fi
-
 # See how we were called.
 case "$1" in
   start)
@@ -60,12 +58,17 @@ case "$1" in
        /usr/sbin/httpd -S
        exit $?
        ;;
-  restart|reload)
+  restart)
        $0 stop
        $0 start
        ;;
+   reload)
+       msg_reloading httpd
+       killproc httpd -HUP
+       RETVAL=$?
+       ;;
   *)
-       msg_usage "$0 {start|stop|restart|status}"
+       msg_usage "$0 {start|stop|restart|reload|status}"
        exit 1
        ;;
 esac