SOURCES: apache-common.conf - most of the split done
glen
glen at pld-linux.org
Sun Dec 18 20:44:33 CET 2005
Author: glen Date: Sun Dec 18 19:44:33 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- most of the split done
---- Files affected:
SOURCES:
apache-common.conf (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/apache-common.conf
diff -u SOURCES/apache-common.conf:1.5 SOURCES/apache-common.conf:1.6
--- SOURCES/apache-common.conf:1.5 Wed Dec 14 23:15:40 2005
+++ SOURCES/apache-common.conf Sun Dec 18 20:44:28 2005
@@ -1,64 +1,4 @@
-# TODO
-# - split each section to module's config fragment
-# - move LoadModule's to each module's config
-#
-#
-# Dynamic Shared Object (DSO) Support
-#
-# To be able to use the functionality of a module which was built as a DSO you
-# have to place corresponding `LoadModule' lines at this location so the
-# directives contained in it are actually available _before_ they are used.
-# Statically compiled modules (those listed by `httpd -l') do not need
-# to be loaded here.
-#
-# Example:
-# LoadModule foo_module modules/mod_foo.so
-#
-LoadModule authn_file_module modules/mod_authn_file.so
-LoadModule authn_dbm_module modules/mod_authn_dbm.so
-LoadModule authn_anon_module modules/mod_authn_anon.so
-LoadModule authn_dbd_module modules/mod_authn_dbd.so
-LoadModule authn_default_module modules/mod_authn_default.so
-LoadModule authn_alias_module modules/mod_authn_alias.so
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
-LoadModule authz_user_module modules/mod_authz_user.so
-LoadModule authz_dbm_module modules/mod_authz_dbm.so
-LoadModule authz_owner_module modules/mod_authz_owner.so
-LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
-LoadModule authz_default_module modules/mod_authz_default.so
-LoadModule auth_basic_module modules/mod_auth_basic.so
-LoadModule dbd_module modules/mod_dbd.so
-LoadModule bucketeer_module modules/mod_bucketeer.so
-LoadModule dumpio_module modules/mod_dumpio.so
-LoadModule echo_module modules/mod_echo.so
-LoadModule case_filter_module modules/mod_case_filter.so
-LoadModule case_filter_in_module modules/mod_case_filter_in.so
-LoadModule ext_filter_module modules/mod_ext_filter.so
-LoadModule include_module modules/mod_include.so
-LoadModule filter_module modules/mod_filter.so
-LoadModule log_config_module modules/mod_log_config.so
-LoadModule log_forensic_module modules/mod_log_forensic.so
-LoadModule logio_module modules/mod_logio.so
-LoadModule env_module modules/mod_env.so
-LoadModule mime_magic_module modules/mod_mime_magic.so
-LoadModule cern_meta_module modules/mod_cern_meta.so
-LoadModule ident_module modules/mod_ident.so
-LoadModule setenvif_module modules/mod_setenvif.so
-LoadModule version_module modules/mod_version.so
-LoadModule optional_hook_export_module modules/mod_optional_hook_export.so
-LoadModule optional_hook_import_module modules/mod_optional_hook_import.so
-LoadModule optional_fn_import_module modules/mod_optional_fn_import.so
-LoadModule optional_fn_export_module modules/mod_optional_fn_export.so
-LoadModule mime_module modules/mod_mime.so
-LoadModule asis_module modules/mod_asis.so
-LoadModule cgi_module modules/mod_cgi.so
-LoadModule negotiation_module modules/mod_negotiation.so
-LoadModule imagemap_module modules/mod_imagemap.so
-LoadModule speling_module modules/mod_speling.so
-LoadModule alias_module modules/mod_alias.so
-
# DocumentRoot: The directory out of which you will serve your
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
@@ -75,8 +15,10 @@
<Directory />
Options FollowSymLinks
AllowOverride None
- Order deny,allow
- Deny from all
+ <IfModule mod_authz_host.c>
+ Order deny,allow
+ Deny from all
+ </IfModule>
</Directory>
#
@@ -107,169 +49,25 @@
#
# Controls who can get stuff from this server.
#
- Order allow,deny
- Allow from all
+ <IfModule mod_authz_host.c>
+ Order allow,deny
+ Allow from all
+ </IfModule>
</Directory>
-#
-# DirectoryIndex: sets the file that Apache will serve if a directory
-# is requested.
-#
-<IfModule dir_module>
- DirectoryIndex index.html
-</IfModule>
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being
-# viewed by Web clients.
-#
-<FilesMatch "^\.ht">
- Order allow,deny
- Deny from all
-</FilesMatch>
-
-<IfModule log_config_module>
- #
- # The following directives define some format nicknames for use with
- # a CustomLog directive (see below).
- #
- LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
- LogFormat "%h %l %u %t \"%r\" %>s %b" common
-
- <IfModule logio_module>
- # You need to enable mod_logio.c to use %I and %O
- LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
- </IfModule>
-
- #
- # The location and format of the access logfile (Common Logfile Format).
- # If you do not define any access logfiles within a <VirtualHost>
- # container, they will be logged here. Contrariwise, if you *do*
- # define per-<VirtualHost> access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
- CustomLog /var/log/httpd/access_log common
-
- #
- # If you prefer a logfile with access, agent, and referer information
- # (Combined Logfile Format) you can use the following directive.
- #
- #CustomLog /var/log/httpd/access_log combined
-</IfModule>
-
-<IfModule alias_module>
- #
- # Redirect: Allows you to tell clients about documents that used to
- # exist in your server's namespace, but do not anymore. The client
- # will make a new request for the document at its new location.
- # Example:
- # Redirect permanent /foo http://www.example.com/bar
-
- #
- # Alias: Maps web paths into filesystem paths and is used to
- # access content that does not live under the DocumentRoot.
- # Example:
- # Alias /webpath /full/filesystem/path
- #
- # If you include a trailing / on /webpath then the server will
- # require it to be present in the URL. You will also likely
- # need to provide a <Directory> section to allow access to
- # the filesystem path.
-
- #
- # ScriptAlias: This controls which directories contain server scripts.
- # ScriptAliases are essentially the same as Aliases, except that
- # documents in the target directory are treated as applications and
- # run by the server when requested rather than as documents sent to the
- # client. The same rules about trailing "/" apply to ScriptAlias
- # directives as to Alias.
- #
- ScriptAlias /cgi-bin/ "/home/services/httpd/cgi-bin/"
-
-</IfModule>
-
-<IfModule cgid_module>
- #
- # ScriptSock: On threaded servers, designate the path to the UNIX
- # socket used to communicate with the CGI daemon of mod_cgid.
- #
- #Scriptsock /var/run/cgisock
-</IfModule>
-
-#
# "/home/services/httpd/cgi-bin" should be changed to whatever your ScriptAliased
# CGI directory exists, if you have that configured.
#
<Directory "/home/services/httpd/cgi-bin">
AllowOverride None
Options None
- Order allow,deny
- Allow from all
+ <IfModule mod_authz_host.c>
+ Order allow,deny
+ Allow from all
+ </IfModule>
</Directory>
-<IfModule mime_module>
- #
- # TypesConfig points to the file containing the list of mappings from
- # filename extension to MIME-type.
- #
- TypesConfig /etc/mime.types
-
- #
- # AddType allows you to add to or override the MIME configuration
- # file specified in TypesConfig for specific file types.
- #
- #AddType application/x-gzip .tgz
- #
- # AddEncoding allows you to have certain browsers uncompress
- # information on the fly. Note: Not all browsers support this.
- #
- #AddEncoding x-compress .Z
- #AddEncoding x-gzip .gz .tgz
- #
- # If the AddEncoding directives above are commented-out, then you
- # probably should define those extensions to indicate media types:
- #
- AddType application/x-compress .Z
- AddType application/x-gzip .gz .tgz
-
- #
- # AddHandler allows you to map certain file extensions to "handlers":
- # actions unrelated to filetype. These can be either built into the server
- # or added with the Action directive (see below)
- #
- # To use CGI scripts outside of ScriptAliased directories:
- # (You will also need to add "ExecCGI" to the "Options" directive.)
- #
- #AddHandler cgi-script .cgi
-
- # For files that include their own HTTP headers:
- #AddHandler send-as-is asis
-
- # For server-parsed imagemap files:
- #AddHandler imap-file map
-
- # For type maps (negotiated resources):
- #AddHandler type-map var
-
- #
- # Filters allow you to process content before it is sent to the client.
- #
- # To parse .shtml files for server-side includes (SSI):
- # (You will also need to add "Includes" to the "Options" directive.)
- #
- #AddType text/html .shtml
- #AddOutputFilter INCLUDES .shtml
-</IfModule>
-
-#
-# The mod_mime_magic module allows the server to use various hints from the
-# contents of the file itself to determine its type. The MIMEMagicFile
-# directive tells the module where the hint definitions are located.
-#
-#MIMEMagicFile /magic
-
-#
# Customizable error responses come in three flavors:
# 1) plain text 2) local redirects 3) external redirects
#
@@ -298,20 +96,7 @@
# the server, or you may simply copy their contents here and change as
# necessary.
-# Server-pool management (MPM specific)
-#Include /extra/httpd-mpm.conf
-
-# Multi-language error messages
-#Include /extra/httpd-multilang-errordoc.conf
-
# Language settings
#Include /extra/httpd-languages.conf
-
-# Virtual hosts
-#Include /extra/httpd-vhosts.conf
-
-# Local access to the Apache HTTP Server Manual
-#Include /extra/httpd-manual.conf
-#
# vim:syn=apache
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/apache-common.conf?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list