1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-13 23:36:08 +00:00
freebsd-ports/www/apache13-fp/files/patch-ag
Bill Fumerola e6503fb81a Upgrade to the latest and greatest apache/frontpage combo.
PR:		ports/16974
Submitted by:	maintainer
2000-03-01 06:25:15 +00:00

134 lines
3.8 KiB
Plaintext

--- conf/httpd.conf-dist.orig Wed May 5 15:17:59 1999
+++ conf/httpd.conf-dist Wed Oct 27 21:37:07 1999
@@ -97,6 +97,9 @@
#ResourceConfig conf/srm.conf
#AccessConfig conf/access.conf
+ResourceConfig @@ServerRoot@@/srm.conf
+AccessConfig @@ServerRoot@@/access.conf
+
#
# Timeout: The number of seconds before receives and sends time out.
#
@@ -176,6 +179,10 @@
#Listen 3000
#Listen 12.34.56.78:80
+Listen 80
+# We need to Listen to port 8080, as that is were the Apache Docs can be accessed from.
+Listen 8080
+
#
# BindAddress: You can support virtual hosts with this option. This directive
# is used to tell the server which IP address to listen to. It can either
@@ -274,7 +281,7 @@
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
#
-DocumentRoot "@@ServerRoot@@/htdocs"
+DocumentRoot @@ServerRoot@@/htdocs
#
# Each directory to which Apache has access, can be configured with respect
@@ -315,7 +322,16 @@
# override. Can also be "All", or any combination of "Options", "FileInfo",
# "AuthConfig", and "Limit"
#
- AllowOverride None
+<IfDefine MOD_FP>
+### These are the Minimum options need by the FrontPage Module.
+### With out these options set the FrontPage Client will not be
+### able to access the server.
+ AllowOverride AuthConfig Limit Indexes Options
+</IfDefine>
+
+<IfDefine !MOD_FP>
+# AllowOverride None
+</IfDefine>
#
# Controls who can get stuff from this server.
@@ -347,6 +363,15 @@
# </Limit>
#</Directory>
+### In Order for FrontPage to work in User and Virtual ###
+### Web Directories, they need to be set up as shown: ###
+<IfDefine MOD_FP>
+ <Directory /*/public_html>
+ AllowOverride AuthConfig Limit Indexes Options
+ Options ExecCGI
+ </Directory>
+</IfDefine>
+
#
# DirectoryIndex: Name of the file or files to use as a pre-written HTML
# directory index. Separate multiple entries with spaces.
@@ -467,7 +492,7 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
-CustomLog logs/access_log common
+#CustomLog logs/access_log common
#
# If you would like to have agent and referer logfiles, uncomment the
@@ -480,7 +505,7 @@
# If you prefer a single logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
-#CustomLog logs/access_log combined
+CustomLog logs/access_log combined
#
# Optionally add a line containing the server version and virtual host
@@ -852,3 +877,48 @@
#<VirtualHost _default_:*>
#</VirtualHost>
+
+# This virtual Host allows access to the Apache & Frontpage Docs on port 8080
+<VirtualHost _default_:8080>
+ ServerAdmin webmaster@@@HOSTNAME@@
+ DocumentRoot @@MANUAL@@
+ ServerName @@HOSTNAME@@
+
+ <Directory "@@MANUAL@@">
+
+ #
+ # This may also be "None", "All", or any combination of "Indexes",
+ # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
+ #
+ # Note that "MultiViews" must be named *explicitly* --- "Options All"
+ # doesn't give it to you.
+ #
+ Options Indexes FollowSymLinks
+
+ #
+ # This controls which options the .htaccess files in directories can
+ # override. Can also be "All", or any combination of "Options", "FileInfo",
+ # "AuthConfig", and "Limit"
+ #
+ AllowOverride None
+
+ #
+ # Controls who can get stuff from this server.
+ #
+ Order allow,deny
+ Allow from all
+ </Directory>
+
+</VirtualHost>
+
+# This Virtual Host makes it so FrontPage will display pages from the
+# root web. Without this virtual host, Frontpage accesses the pages
+# on the default virtual host (port 8080) instead.
+#
+#NOTE: This Virtual Host Entry must be kept as the last _default_
+# virtual host entry.
+<VirtualHost _default_:80>
+ ServerAdmin webmaster@@@HOSTNAME@@
+ ServerName @@HOSTNAME@@
+</VirtualHost>
+