forked from Lainports/freebsd-ports
180 lines
5.1 KiB
Text
180 lines
5.1 KiB
Text
--- conf/httpd.conf-dist.orig Thu Sep 28 08:12:36 2000
|
|
+++ conf/httpd.conf-dist Sat Nov 25 11:40:39 2000
|
|
@@ -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
|
|
@@ -278,7 +285,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
|
|
@@ -319,7 +326,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.
|
|
@@ -353,12 +369,36 @@
|
|
# </LimitExcept>
|
|
#</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.
|
|
#
|
|
<IfModule mod_dir.c>
|
|
- DirectoryIndex index.html
|
|
+ <IfModule mod_php3.c>
|
|
+ <IfModule mod_php4.c>
|
|
+ DirectoryIndex index.php index.php3 index.html
|
|
+ </IfModule>
|
|
+ <IfModule !mod_php4.c>
|
|
+ DirectoryIndex index.php3 index.html
|
|
+ </IfModule>
|
|
+ </IfModule>
|
|
+ <IfModule !mod_php3.c>
|
|
+ <IfModule mod_php4.c>
|
|
+ DirectoryIndex index.php index.html
|
|
+ </IfModule>
|
|
+ <IfModule !mod_php4.c>
|
|
+ DirectoryIndex index.html
|
|
+ </IfModule>
|
|
+ </IfModule>
|
|
</IfModule>
|
|
|
|
#
|
|
@@ -477,7 +517,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
|
|
@@ -490,7 +530,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
|
|
@@ -729,13 +769,17 @@
|
|
# For example, the PHP 3.x module (not part of the Apache distribution - see
|
|
# http://www.php.net) will typically use:
|
|
#
|
|
- #AddType application/x-httpd-php3 .php3
|
|
- #AddType application/x-httpd-php3-source .phps
|
|
+ <IfModule mod_php3.c>
|
|
+ AddType application/x-httpd-php3 .php3
|
|
+ AddType application/x-httpd-php3-source .php3s
|
|
+ </IfModule>
|
|
#
|
|
# And for PHP 4.x, use:
|
|
#
|
|
- #AddType application/x-httpd-php .php
|
|
- #AddType application/x-httpd-php-source .phps
|
|
+ <IfModule mod_php4.c>
|
|
+ AddType application/x-httpd-php .php
|
|
+ AddType application/x-httpd-php-source .phps
|
|
+ </IfModule>
|
|
|
|
AddType application/x-tar .tgz
|
|
|
|
@@ -854,6 +898,51 @@
|
|
# Deny from all
|
|
# Allow from .your_domain.com
|
|
#</Location>
|
|
+
|
|
+# 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>
|
|
+
|
|
|
|
#
|
|
# Allow remote server configuration reports, with the URL of
|