SOURCES: apache-common.conf, apache-manual.conf, apache-mod_alias....

glen glen at pld-linux.org
Wed Dec 21 14:27:33 CET 2005


Author: glen                         Date: Wed Dec 21 13:27:33 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- tabs

---- Files affected:
SOURCES:
   apache-common.conf (1.7 -> 1.8) , apache-manual.conf (1.1 -> 1.2) , apache-mod_alias.conf (1.1 -> 1.2) , apache-mod_autoindex.conf (1.8 -> 1.9) , apache-mod_cgid.conf (1.2 -> 1.3) , apache-mod_dav.conf (1.8 -> 1.9) , apache-mod_deflate.conf (1.5 -> 1.6) , apache-mod_dir.conf (1.9 -> 1.10) , apache-mod_info.conf (1.8 -> 1.9) , apache-mod_mime.conf (1.1 -> 1.2) , apache-mod_perl.conf (1.9 -> 1.10) , apache-mod_proxy.conf (1.8 -> 1.9) , apache-mod_ssl.conf (1.12 -> 1.13) , apache-mod_status.conf (1.7 -> 1.8) , apache-mod_suexec.conf (1.4 -> 1.5) , apache-mod_userdir.conf (1.2 -> 1.3) , apache-mpm.conf (1.2 -> 1.3) , apache-multilang-errordoc.conf (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/apache-common.conf
diff -u SOURCES/apache-common.conf:1.7 SOURCES/apache-common.conf:1.8
--- SOURCES/apache-common.conf:1.7	Wed Dec 21 14:20:11 2005
+++ SOURCES/apache-common.conf	Wed Dec 21 14:27:27 2005
@@ -13,8 +13,8 @@
 # features.
 #
 <Directory />
-    Options FollowSymLinks
-    AllowOverride None
+	Options FollowSymLinks
+	AllowOverride None
 	<IfModule mod_authz_host.c>
 		Order deny,allow
 		Deny from all
@@ -25,30 +25,30 @@
 # This should be changed to whatever you set DocumentRoot to.
 #
 <Directory "/home/services/httpd/html">
-    #
-    # Possible values for the Options directive are "None", "All",
-    # or any combination of:
-    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
-    #
-    # Note that "MultiViews" must be named *explicitly* --- "Options All"
-    # doesn't give it to you.
-    #
-    # The Options directive is both complicated and important.  Please see
-    # http://httpd.apache.org/docs/2.2/mod/core.html#options
-    # for more information.
-    #
-    Options Indexes FollowSymLinks
+	#
+	# Possible values for the Options directive are "None", "All",
+	# or any combination of:
+	#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+	#
+	# Note that "MultiViews" must be named *explicitly* --- "Options All"
+	# doesn't give it to you.
+	#
+	# The Options directive is both complicated and important.  Please see
+	# http://httpd.apache.org/docs/2.2/mod/core.html#options
+	# for more information.
+	#
+	Options Indexes FollowSymLinks
 
-    #
-    # AllowOverride controls what directives may be placed in .htaccess files.
-    # It can be "All", "None", or any combination of the keywords:
-    #   Options FileInfo AuthConfig Limit
-    #
-    AllowOverride None
+	#
+	# AllowOverride controls what directives may be placed in .htaccess files.
+	# It can be "All", "None", or any combination of the keywords:
+	#   Options FileInfo AuthConfig Limit
+	#
+	AllowOverride None
 
-    #
-    # Controls who can get stuff from this server.
-    #
+	#
+	# Controls who can get stuff from this server.
+	#
 	<IfModule mod_authz_host.c>
 		Order allow,deny
 		Allow from all
@@ -60,8 +60,8 @@
 # CGI directory exists, if you have that configured.
 #
 <Directory "/home/services/httpd/cgi-bin">
-    AllowOverride None
-    Options None
+	AllowOverride None
+	Options None
 	<IfModule mod_authz_host.c>
 		Order allow,deny
 		Allow from all

================================================================
Index: SOURCES/apache-manual.conf
diff -u SOURCES/apache-manual.conf:1.1 SOURCES/apache-manual.conf:1.2
--- SOURCES/apache-manual.conf:1.1	Sun Dec 18 20:31:58 2005
+++ SOURCES/apache-manual.conf	Wed Dec 21 14:27:28 2005
@@ -10,18 +10,18 @@
 AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ "/home/services/httpd/manual$1"
 
 <Directory "/home/services/httpd/manual">
-    Options Indexes
-    AllowOverride None
-    Order allow,deny
-    Allow from all
+	Options Indexes
+	AllowOverride None
+	Order allow,deny
+	Allow from all
 
-    <Files *.html>
-        SetHandler type-map
-    </Files>
+	<Files *.html>
+		SetHandler type-map
+	</Files>
 
-    SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br|ru)/ prefer-language=$1
-    RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br|ru)){2,}(/.*)?$ /manual/$1$2
+	SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br|ru)/ prefer-language=$1
+	RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br|ru)){2,}(/.*)?$ /manual/$1$2
 
-    LanguagePriority en de es fr ja ko pt-br ru 
-    ForceLanguagePriority Prefer Fallback
+	LanguagePriority en de es fr ja ko pt-br ru 
+	ForceLanguagePriority Prefer Fallback
 </Directory>

================================================================
Index: SOURCES/apache-mod_alias.conf
diff -u SOURCES/apache-mod_alias.conf:1.1 SOURCES/apache-mod_alias.conf:1.2
--- SOURCES/apache-mod_alias.conf:1.1	Sun Dec 18 20:31:58 2005
+++ SOURCES/apache-mod_alias.conf	Wed Dec 21 14:27:28 2005
@@ -2,32 +2,32 @@
 LoadModule alias_module modules/mod_alias.so
 
 <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
+	#
+	# 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.
+	#
+	# 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/"
+	#
+	# 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>

================================================================
Index: SOURCES/apache-mod_autoindex.conf
diff -u SOURCES/apache-mod_autoindex.conf:1.8 SOURCES/apache-mod_autoindex.conf:1.9
--- SOURCES/apache-mod_autoindex.conf:1.8	Wed Dec 21 14:20:11 2005
+++ SOURCES/apache-mod_autoindex.conf	Wed Dec 21 14:27:28 2005
@@ -1,5 +1,5 @@
 # $Id$
-LoadModule autoindex_module           modules/mod_autoindex.so
+LoadModule autoindex_module	modules/mod_autoindex.so
 
 #
 # Directives controlling the display of server-generated directory listings.
@@ -23,12 +23,12 @@
 Alias /icons/ "/home/services/httpd/icons/"
 
 <Directory "/home/services/httpd/icons">
-    Options Indexes MultiViews
-    AllowOverride None
+	Options Indexes MultiViews
+	AllowOverride None
 	<IfModule mod_authz_host.c>
-        Order allow,deny
-        Allow from all
-    </IfModule>
+		Order allow,deny
+		Allow from all
+	</IfModule>
 </Directory>
 
 #

================================================================
Index: SOURCES/apache-mod_cgid.conf
diff -u SOURCES/apache-mod_cgid.conf:1.2 SOURCES/apache-mod_cgid.conf:1.3
--- SOURCES/apache-mod_cgid.conf:1.2	Wed Dec 21 14:20:11 2005
+++ SOURCES/apache-mod_cgid.conf	Wed Dec 21 14:27:28 2005
@@ -2,9 +2,9 @@
 LoadModule cgid_module	modules/mod_cgid.so
 
 <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
+	#
+	# 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>

================================================================
Index: SOURCES/apache-mod_dav.conf
diff -u SOURCES/apache-mod_dav.conf:1.8 SOURCES/apache-mod_dav.conf:1.9
--- SOURCES/apache-mod_dav.conf:1.8	Wed Dec 21 14:20:11 2005
+++ SOURCES/apache-mod_dav.conf	Wed Dec 21 14:27:28 2005
@@ -1,13 +1,13 @@
 # $Id$
-LoadModule dav_module           modules/mod_dav.so
-LoadModule dav_fs_module        modules/mod_dav_fs.so
-LoadModule dav_lock_module      modules/mod_dav_lock.so
+LoadModule dav_module		modules/mod_dav.so
+LoadModule dav_fs_module	modules/mod_dav_fs.so
+LoadModule dav_lock_module	modules/mod_dav_lock.so
 
 #
 # Distributed authoring and versioning (WebDAV)
 #
 # Required modules: mod_dav, mod_dav_fs, mod_setenvif, mod_alias
-#                   mod_auth_digest, mod_authn_file
+#				   mod_auth_digest, mod_authn_file
 #
 
 <IfModule mod_dav.c>
@@ -23,19 +23,19 @@
 
 Alias /uploads "/etc/httpd/httpd/uploads"
 <Directory "/etc/httpd/httpd/uploads">
-    Dav On
+	Dav On
 
-    AuthType Digest
-    AuthName DAV-upload
-    # You can use the htdigest program to create the password database:
-    #   htdigest -c "/etc/httpd/httpd/user.passwd" DAV-upload admin
-    AuthUserFile "/etc/httpd/httpd/user.passwd"
-
-    # Allow universal read-access, but writes are restricted
-    # to the admin user.
-    <LimitExcept GET OPTIONS>
-        require user admin
-    </LimitExcept>
+	AuthType Digest
+	AuthName DAV-upload
+	# You can use the htdigest program to create the password database:
+	#   htdigest -c "/etc/httpd/httpd/user.passwd" DAV-upload admin
+	AuthUserFile "/etc/httpd/httpd/user.passwd"
+
+	# Allow universal read-access, but writes are restricted
+	# to the admin user.
+	<LimitExcept GET OPTIONS>
+		require user admin
+	</LimitExcept>
 </Directory>
 
 #

================================================================
Index: SOURCES/apache-mod_deflate.conf
diff -u SOURCES/apache-mod_deflate.conf:1.5 SOURCES/apache-mod_deflate.conf:1.6
--- SOURCES/apache-mod_deflate.conf:1.5	Wed Dec 21 14:20:11 2005
+++ SOURCES/apache-mod_deflate.conf	Wed Dec 21 14:27:28 2005
@@ -1,24 +1,24 @@
 # $Id$
-LoadModule deflate_module        modules/mod_deflate.so
+LoadModule deflate_module		modules/mod_deflate.so
 
 SetOutputFilter DEFLATE
 
 <IfModule mod_setenvif.c>
-    # Netscape 4.x has some problems...
-    BrowserMatch ^Mozilla/4 gzip-only-text/html
+	# Netscape 4.x has some problems...
+	BrowserMatch ^Mozilla/4 gzip-only-text/html
 
-    # Netscape 4.06-4.08 have some more problems
-    BrowserMatch ^Mozilla/4\.0[678] no-gzip
+	# Netscape 4.06-4.08 have some more problems
+	BrowserMatch ^Mozilla/4\.0[678] no-gzip
 
-    # MSIE masquerades as Netscape, but it is fine
-    BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
+	# MSIE masquerades as Netscape, but it is fine
+	BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
 
-    SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary
-    SetEnvIfNoCase Request_URI \.pdf$ no-gzip dont-vary
-    SetEnvIfNoCase Request_URI \.(?:exe|t?gz|zip|bz2|sit|rar|iso)$ no-gzip dont-vary
+	SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary
+	SetEnvIfNoCase Request_URI \.pdf$ no-gzip dont-vary
+	SetEnvIfNoCase Request_URI \.(?:exe|t?gz|zip|bz2|sit|rar|iso)$ no-gzip dont-vary
 </IfModule>
 
 <IfModule mod_headers.c>
-    # Make sure proxies don't deliver the wrong content
-    Header append Vary User-Agent env=!dont-vary
+	# Make sure proxies don't deliver the wrong content
+	Header append Vary User-Agent env=!dont-vary
 </IfModule>

================================================================
Index: SOURCES/apache-mod_dir.conf
diff -u SOURCES/apache-mod_dir.conf:1.9 SOURCES/apache-mod_dir.conf:1.10
--- SOURCES/apache-mod_dir.conf:1.9	Wed Dec 21 14:20:11 2005
+++ SOURCES/apache-mod_dir.conf	Wed Dec 21 14:27:28 2005
@@ -1,5 +1,5 @@
 # $Id$
-LoadModule dir_module           modules/mod_dir.so
+LoadModule dir_module	modules/mod_dir.so
 
 # DirectoryIndex: sets the file that Apache will serve if a directory
 # is requested.

================================================================
Index: SOURCES/apache-mod_info.conf
diff -u SOURCES/apache-mod_info.conf:1.8 SOURCES/apache-mod_info.conf:1.9
--- SOURCES/apache-mod_info.conf:1.8	Wed Dec 21 14:20:11 2005
+++ SOURCES/apache-mod_info.conf	Wed Dec 21 14:27:28 2005
@@ -1,5 +1,5 @@
 # $Id$
-LoadModule info_module          modules/mod_info.so
+LoadModule info_module		modules/mod_info.so
 
 # Get information about the requests being processed by the server
 # and the configuration of the server.
@@ -13,10 +13,10 @@
 # Change the ".example.com" to match your domain to enable.
 #
 <Location /server-info>
-    SetHandler server-info
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1
+	SetHandler server-info
+	Order deny,allow
+	Deny from all
+	Allow from 127.0.0.1
 </Location>
 
 </IfModule>

================================================================
Index: SOURCES/apache-mod_mime.conf
diff -u SOURCES/apache-mod_mime.conf:1.1 SOURCES/apache-mod_mime.conf:1.2
--- SOURCES/apache-mod_mime.conf:1.1	Sun Dec 18 20:31:58 2005
+++ SOURCES/apache-mod_mime.conf	Wed Dec 21 14:27:28 2005
@@ -2,55 +2,55 @@
 LoadModule mime_module modules/mod_mime.so
 
 <IfModule mime_module>
-    #
-    # TypesConfig points to the file containing the list of mappings from
-    # filename extension to MIME-type.
-    #
+	#
+	# 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
+	#
+	# 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>

================================================================
Index: SOURCES/apache-mod_perl.conf
diff -u SOURCES/apache-mod_perl.conf:1.9 SOURCES/apache-mod_perl.conf:1.10
--- SOURCES/apache-mod_perl.conf:1.9	Wed Dec 21 14:20:11 2005
+++ SOURCES/apache-mod_perl.conf	Wed Dec 21 14:27:28 2005
@@ -1,2 +1,2 @@
 # $Id$
-LoadModule perl_module          modules/mod_perl.so
+LoadModule perl_module		modules/mod_perl.so

================================================================
Index: SOURCES/apache-mod_proxy.conf
diff -u SOURCES/apache-mod_proxy.conf:1.8 SOURCES/apache-mod_proxy.conf:1.9
--- SOURCES/apache-mod_proxy.conf:1.8	Wed Dec 21 14:20:11 2005
+++ SOURCES/apache-mod_proxy.conf	Wed Dec 21 14:27:28 2005
@@ -1,13 +1,13 @@
 # $Id$
-LoadModule proxy_module             modules/mod_proxy.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
+#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:
@@ -20,9 +20,9 @@
 # http://victim:25/ and sending raw data.
 #
 <Proxy *>
-    Order deny,allow
-    Deny from all
-#    Allow from .your-domain.com
+	Order deny,allow
+	Deny from all
+#	Allow from .your-domain.com
 </Proxy>
 
 #

================================================================
Index: SOURCES/apache-mod_ssl.conf
diff -u SOURCES/apache-mod_ssl.conf:1.12 SOURCES/apache-mod_ssl.conf:1.13
--- SOURCES/apache-mod_ssl.conf:1.12	Wed Dec 21 14:20:12 2005
+++ SOURCES/apache-mod_ssl.conf	Wed Dec 21 14:27:28 2005
@@ -1,5 +1,5 @@
 # $Id$
-LoadModule ssl_module           modules/mod_ssl.so
+LoadModule ssl_module	modules/mod_ssl.so
 
 # This is the Apache server configuration file providing SSL support.
 # It contains the configuration directives to instruct the server how to
@@ -30,7 +30,7 @@
 # standard HTTP port (see above) and to the HTTPS port
 #
 # Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
-#       Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443"
+#	   Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443"
 #
 Listen 443
 
@@ -45,7 +45,7 @@
 #   Some MIME-types for downloading Certificates and CRLs
 #
 AddType application/x-x509-ca-cert .crt
-AddType application/x-pkcs7-crl    .crl
+AddType application/x-pkcs7-crl	.crl
 
 #   Pass Phrase Dialog:
 #   Configure the pass phrase gathering process.
@@ -56,8 +56,8 @@
 #   Inter-Process Session Cache:
 #   Configure the SSL Session Cache: First the mechanism
 #   to use and second the expiring timeout (in seconds).
-#SSLSessionCache         dbm:/var/run/ssl_scache
-SSLSessionCache        shmcb:/var/run/ssl_scache(512000)
+#SSLSessionCache		 dbm:/var/run/ssl_scache
+SSLSessionCache		shmcb:/var/run/ssl_scache(512000)
 SSLSessionCacheTimeout  300
 
 #   Semaphore:
@@ -119,8 +119,8 @@
 #   certificates for client authentication or alternatively one
 #   huge file containing all of them (file must be PEM encoded)
 #   Note: Inside SSLCACertificatePath you need hash symlinks
-#         to point to the certificate files. Use the provided
-#         Makefile to update the hash symlinks after changes.
+#		 to point to the certificate files. Use the provided
+#		 Makefile to update the hash symlinks after changes.
 #SSLCACertificatePath /etc/httpd/ssl
 #SSLCACertificateFile /etc/httpd/ssl/ca-bundle.crt
 
@@ -129,8 +129,8 @@
 #   authentication or alternatively one huge file containing all
 #   of them (file must be PEM encoded)
 #   Note: Inside SSLCARevocationPath you need hash symlinks
-#         to point to the certificate files. Use the provided
-#         Makefile to update the hash symlinks after changes.
+#		 to point to the certificate files. Use the provided
+#		 Makefile to update the hash symlinks after changes.
 #SSLCARevocationPath /etc/httpd/ssl
 #SSLCARevocationFile /etc/httpd/ssl/ca-bundle.crl
 
@@ -149,47 +149,47 @@
 #   mixture between C and Perl.  See the mod_ssl documentation
 #   for more details.
 #<Location />
-#SSLRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
-#            and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
-#            and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
-#            and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
-#            and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20       ) \
-#           or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
+#SSLRequire (	%{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
+#			and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
+#			and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/apache-common.conf?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SOURCES/apache-manual.conf?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/apache-mod_alias.conf?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/apache-mod_autoindex.conf?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SOURCES/apache-mod_cgid.conf?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/apache-mod_dav.conf?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SOURCES/apache-mod_deflate.conf?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SOURCES/apache-mod_dir.conf?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SOURCES/apache-mod_info.conf?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SOURCES/apache-mod_mime.conf?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/apache-mod_perl.conf?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SOURCES/apache-mod_proxy.conf?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SOURCES/apache-mod_ssl.conf?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SOURCES/apache-mod_status.conf?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SOURCES/apache-mod_suexec.conf?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/apache-mod_userdir.conf?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/apache-mpm.conf?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/apache-multilang-errordoc.conf?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list