SOURCES: apache1-common.conf, apache1-errordocs.conf, apache1-http...
glen
glen at pld-linux.org
Wed Dec 21 14:22:52 CET 2005
Author: glen Date: Wed Dec 21 13:22:52 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- vim modelines not needed (vim patched to be smart)
---- Files affected:
SOURCES:
apache1-common.conf (1.3 -> 1.4) , apache1-errordocs.conf (1.4 -> 1.5) , apache1-httpd.conf (1.12 -> 1.13) , apache1-mod_actions.conf (1.1 -> 1.2) , apache1-mod_alias.conf (1.2 -> 1.3) , apache1-mod_autoindex.conf (1.3 -> 1.4) , apache1-mod_cern_meta.conf (1.1 -> 1.2) , apache1-mod_dir.conf (1.1 -> 1.2) , apache1-mod_info.conf (1.1 -> 1.2) , apache1-mod_log_config.conf (1.3 -> 1.4) , apache1-mod_mime.conf (1.1 -> 1.2) , apache1-mod_mime_magic.conf (1.1 -> 1.2) , apache1-mod_negotiation.conf (1.1 -> 1.2) , apache1-mod_proxy.conf (1.3 -> 1.4) , apache1-mod_rpaf.conf (1.2 -> 1.3) , apache1-mod_setenvif.conf (1.2 -> 1.3) , apache1-mod_ssl.conf (1.5 -> 1.6) , apache1-mod_status.conf (1.2 -> 1.3) , apache1-mod_userdir.conf (1.1 -> 1.2) , apache1-mod_vhost_alias.conf (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/apache1-common.conf
diff -u SOURCES/apache1-common.conf:1.3 SOURCES/apache1-common.conf:1.4
--- SOURCES/apache1-common.conf:1.3 Sat Jun 18 15:47:44 2005
+++ SOURCES/apache1-common.conf Wed Dec 21 14:22:46 2005
@@ -7,13 +7,13 @@
# First, we configure the "default" to be a very restrictive set of
# permissions.
<Directory />
- Options FollowSymLinks
- AllowOverride None
+ Options FollowSymLinks
+ AllowOverride None
- <IfModule mod_access.c>
- Order deny,allow
- Deny from all
- </IfModule>
+ <IfModule mod_access.c>
+ Order deny,allow
+ Deny from all
+ </IfModule>
</Directory>
# These should be changed to whatever You set DocumentRoot to.
@@ -21,18 +21,16 @@
<Directory "/home/services/apache/html">
Options Indexes FollowSymLinks MultiViews
AllowOverride None
- <IfModule mod_access.c>
- Order allow,deny
- Allow from all
- </IfModule>
+ <IfModule mod_access.c>
+ Order allow,deny
+ Allow from all
+ </IfModule>
</Directory>
<IfModule mod_access.c>
- <Files ~ "^\.ht">
- Order allow,deny
- Deny from all
- Satisfy All
- </Files>
+ <Files ~ "^\.ht">
+ Order allow,deny
+ Deny from all
+ Satisfy All
+ </Files>
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-errordocs.conf
diff -u SOURCES/apache1-errordocs.conf:1.4 SOURCES/apache1-errordocs.conf:1.5
--- SOURCES/apache1-errordocs.conf:1.4 Thu Mar 17 14:32:03 2005
+++ SOURCES/apache1-errordocs.conf Wed Dec 21 14:22:46 2005
@@ -3,9 +3,9 @@
<IfModule mod_alias.c>
Alias /errordocs/ "/home/services/apache/errordocs/"
<Directory /home/services/apache/errordocs/>
- AllowOverride None
- Options IncludesNoExec FollowSymLinks
- Allow from all
+ AllowOverride None
+ Options IncludesNoExec FollowSymLinks
+ Allow from all
</Directory>
ErrorDocument 400 /errordocs/400.shtml
@@ -21,5 +21,3 @@
ErrorDocument 500 /errordocs/500.shtml
ErrorDocument 503 /errordocs/503.shtml
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-httpd.conf
diff -u SOURCES/apache1-httpd.conf:1.12 SOURCES/apache1-httpd.conf:1.13
--- SOURCES/apache1-httpd.conf:1.12 Sun Nov 20 21:10:24 2005
+++ SOURCES/apache1-httpd.conf Wed Dec 21 14:22:46 2005
@@ -11,7 +11,7 @@
ServerRoot "/etc/apache"
ResourceConfig /dev/null
-AccessConfig /dev/null
+AccessConfig /dev/null
LockFile /var/run/apache.lock
PidFile /var/run/apache.pid
@@ -89,7 +89,5 @@
MaxRequestsPerChild 30
# These lines here are for packages which still use apxs to activate module.
-# LoadModule access_module modules/mod_access.so
+# LoadModule access_module modules/mod_access.so
# AddModule mod_foo.c
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_actions.conf
diff -u SOURCES/apache1-mod_actions.conf:1.1 SOURCES/apache1-mod_actions.conf:1.2
--- SOURCES/apache1-mod_actions.conf:1.1 Tue Jan 11 22:05:46 2005
+++ SOURCES/apache1-mod_actions.conf Wed Dec 21 14:22:46 2005
@@ -1,12 +1,11 @@
# $Id$
-LoadModule actions_module modules/mod_actions.so
+LoadModule actions_module modules/mod_actions.so
<IfModule mod_actions.c>
# Action lets you define media types that will execute a script whenever
# a matching file is called. This eliminates the need for repeated URL
# pathnames for oft-used CGI file processors.
+
# Format: Action media/type /cgi-script/location
# Format: Action handler-name /cgi-script/location
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_alias.conf
diff -u SOURCES/apache1-mod_alias.conf:1.2 SOURCES/apache1-mod_alias.conf:1.3
--- SOURCES/apache1-mod_alias.conf:1.2 Sat Jun 18 15:46:49 2005
+++ SOURCES/apache1-mod_alias.conf Wed Dec 21 14:22:46 2005
@@ -52,5 +52,3 @@
# clients where to look for the relocated document.
# Format: Redirect old-URI new-URL
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_autoindex.conf
diff -u SOURCES/apache1-mod_autoindex.conf:1.3 SOURCES/apache1-mod_autoindex.conf:1.4
--- SOURCES/apache1-mod_autoindex.conf:1.3 Tue Jan 11 22:05:46 2005
+++ SOURCES/apache1-mod_autoindex.conf Wed Dec 21 14:22:46 2005
@@ -83,5 +83,3 @@
IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_cern_meta.conf
diff -u SOURCES/apache1-mod_cern_meta.conf:1.1 SOURCES/apache1-mod_cern_meta.conf:1.2
--- SOURCES/apache1-mod_cern_meta.conf:1.1 Tue Jan 11 22:05:46 2005
+++ SOURCES/apache1-mod_cern_meta.conf Wed Dec 21 14:22:46 2005
@@ -14,5 +14,3 @@
#
MetaSuffix .meta
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_dir.conf
diff -u SOURCES/apache1-mod_dir.conf:1.1 SOURCES/apache1-mod_dir.conf:1.2
--- SOURCES/apache1-mod_dir.conf:1.1 Tue Jan 11 22:05:46 2005
+++ SOURCES/apache1-mod_dir.conf Wed Dec 21 14:22:46 2005
@@ -7,5 +7,3 @@
<IfModule mod_dir.c>
DirectoryIndex index.html index.htm index.shtml index.cgi index.php
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_info.conf
diff -u SOURCES/apache1-mod_info.conf:1.1 SOURCES/apache1-mod_info.conf:1.2
--- SOURCES/apache1-mod_info.conf:1.1 Tue Jan 11 22:05:46 2005
+++ SOURCES/apache1-mod_info.conf Wed Dec 21 14:22:46 2005
@@ -5,13 +5,10 @@
# Allow remote server configuration reports, with the URL of
# http://servername/server-info (requires that mod_info.c be loaded).
# Change the "127.0.0.1" 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>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_log_config.conf
diff -u SOURCES/apache1-mod_log_config.conf:1.3 SOURCES/apache1-mod_log_config.conf:1.4
--- SOURCES/apache1-mod_log_config.conf:1.3 Wed Jan 12 00:07:34 2005
+++ SOURCES/apache1-mod_log_config.conf Wed Dec 21 14:22:46 2005
@@ -14,5 +14,3 @@
CustomLog logs/referer_log referer
CustomLog logs/agent_log agent
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_mime.conf
diff -u SOURCES/apache1-mod_mime.conf:1.1 SOURCES/apache1-mod_mime.conf:1.2
--- SOURCES/apache1-mod_mime.conf:1.1 Tue Jan 11 22:05:46 2005
+++ SOURCES/apache1-mod_mime.conf Wed Dec 21 14:22:46 2005
@@ -1,5 +1,5 @@
# $Id$
-LoadModule mime_module modules/mod_mime.so
+LoadModule mime_module modules/mod_mime.so
<IfModule mod_mime.c>
#
@@ -134,5 +134,3 @@
AddHandler type-map var
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_mime_magic.conf
diff -u SOURCES/apache1-mod_mime_magic.conf:1.1 SOURCES/apache1-mod_mime_magic.conf:1.2
--- SOURCES/apache1-mod_mime_magic.conf:1.1 Tue Jan 11 22:05:46 2005
+++ SOURCES/apache1-mod_mime_magic.conf Wed Dec 21 14:22:46 2005
@@ -14,5 +14,3 @@
MIMEMagicFile /etc/apache/magic
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_negotiation.conf
diff -u SOURCES/apache1-mod_negotiation.conf:1.1 SOURCES/apache1-mod_negotiation.conf:1.2
--- SOURCES/apache1-mod_negotiation.conf:1.1 Tue Jan 11 22:05:46 2005
+++ SOURCES/apache1-mod_negotiation.conf Wed Dec 21 14:22:46 2005
@@ -16,5 +16,3 @@
#
LanguagePriority en pl fr de
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_proxy.conf
diff -u SOURCES/apache1-mod_proxy.conf:1.3 SOURCES/apache1-mod_proxy.conf:1.4
--- SOURCES/apache1-mod_proxy.conf:1.3 Sun May 15 19:13:51 2005
+++ SOURCES/apache1-mod_proxy.conf Wed Dec 21 14:22:46 2005
@@ -37,5 +37,3 @@
ProxyReceiveBufferSize 2048
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_rpaf.conf
diff -u SOURCES/apache1-mod_rpaf.conf:1.2 SOURCES/apache1-mod_rpaf.conf:1.3
--- SOURCES/apache1-mod_rpaf.conf:1.2 Wed Feb 9 19:51:11 2005
+++ SOURCES/apache1-mod_rpaf.conf Wed Dec 21 14:22:46 2005
@@ -16,4 +16,3 @@
#RPAFsethostname Off
</IfModule>
-# vim:ft=apache
================================================================
Index: SOURCES/apache1-mod_setenvif.conf
diff -u SOURCES/apache1-mod_setenvif.conf:1.2 SOURCES/apache1-mod_setenvif.conf:1.3
--- SOURCES/apache1-mod_setenvif.conf:1.2 Fri Jan 14 20:44:50 2005
+++ SOURCES/apache1-mod_setenvif.conf Wed Dec 21 14:22:46 2005
@@ -1,5 +1,5 @@
# $Id$
-LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule setenvif_module modules/mod_setenvif.so
<IfModule mod_setenvif.c>
# The following directives modify normal HTTP response behavior.
@@ -21,5 +21,3 @@
BrowserMatch "Java/1\.0" force-response-1.0
BrowserMatch "JDK/1\.0" force-response-1.0
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_ssl.conf
diff -u SOURCES/apache1-mod_ssl.conf:1.5 SOURCES/apache1-mod_ssl.conf:1.6
--- SOURCES/apache1-mod_ssl.conf:1.5 Thu Mar 17 14:32:17 2005
+++ SOURCES/apache1-mod_ssl.conf Wed Dec 21 14:22:46 2005
@@ -1,4 +1,4 @@
-LoadModule ssl_module modules/libssl.so
+LoadModule ssl_module modules/libssl.so
<IfModule mod_ssl.c>
##--------------------------------------------------------------------------
@@ -25,22 +25,22 @@
# 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.
# The filtering dialog program (`builtin' is a internal
# terminal dialog) has to provide the pass phrase on stdout.
-SSLPassPhraseDialog builtin
+SSLPassPhraseDialog builtin
# Inter-Process Session Cache:
# Configure the SSL Session Cache: First either `none'
# or `dbm:/path/to/file' for the mechanism to use and
# second the expiring timeout (in seconds).
-#SSLSessionCache none
-#SSLSessionCache dbm:logs/ssl_scache
-SSLSessionCache shm:/var/run/ssl_scache(512000)
-SSLSessionCacheTimeout 300
+#SSLSessionCache none
+#SSLSessionCache dbm:logs/ssl_scache
+SSLSessionCache shm:/var/run/ssl_scache(512000)
+SSLSessionCacheTimeout 300
# Semaphore:
# Configure the path to the mutual explusion semaphore the
@@ -52,19 +52,19 @@
# SSL library. The seed data should be of good random quality.
SSLRandomSeed startup builtin
SSLRandomSeed connect builtin
-#SSLRandomSeed startup file:/dev/random 512
+#SSLRandomSeed startup file:/dev/random 512
#SSLRandomSeed startup file:/dev/urandom 512
-#SSLRandomSeed connect file:/dev/random 512
+#SSLRandomSeed connect file:/dev/random 512
#SSLRandomSeed connect file:/dev/urandom 512
# Logging:
# The home of the dedicated SSL protocol logfile. Errors are
-# additionally duplicated in the general error log file. Put
+# additionally duplicated in the general error log file. Put
# this somewhere where it cannot be used for symlink attacks on
# a real server (i.e. somewhere where only root can write).
# Log levels are (ascending order: higher ones include lower ones):
# none, error, warn, info, trace, debug.
-SSLLog logs/ssl_engine_log
+SSLLog logs/ssl_engine_log
SSLLogLevel info
<VirtualHost _default_:443>
@@ -78,27 +78,24 @@
#SSLCARevocationPath /etc/apache/conf/ssl.crl
#SSLCARevocationFile /etc/apache/conf/ssl.crl/ca-bundle.crl
#SSLVerifyClient require
-#SSLVerifyDepth 10
+#SSLVerifyDepth 10
#SSLOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire
<Files ~ "\.(cgi|shtml)$">
- SSLOptions +StdEnvVars
+ SSLOptions +StdEnvVars
</Files>
<Directory "/home/services/apache/html/cgi-bin">
- SSLOptions +StdEnvVars
+ SSLOptions +StdEnvVars
</Directory>
<IfModule mod_setenvif.c>
-SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
+ SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
</IfModule>
<IfModule mod_log_config.c>
-CustomLog logs/ssl_request_log \
- "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+ CustomLog logs/ssl_request_log "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
</IfModule>
</VirtualHost>
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_status.conf
diff -u SOURCES/apache1-mod_status.conf:1.2 SOURCES/apache1-mod_status.conf:1.3
--- SOURCES/apache1-mod_status.conf:1.2 Tue Jan 11 22:05:46 2005
+++ SOURCES/apache1-mod_status.conf Wed Dec 21 14:22:46 2005
@@ -20,5 +20,3 @@
#ExtendedStatus On
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_userdir.conf
diff -u SOURCES/apache1-mod_userdir.conf:1.1 SOURCES/apache1-mod_userdir.conf:1.2
--- SOURCES/apache1-mod_userdir.conf:1.1 Tue Jan 11 22:05:46 2005
+++ SOURCES/apache1-mod_userdir.conf Wed Dec 21 14:22:46 2005
@@ -1,5 +1,5 @@
# $Id$
-LoadModule userdir_module modules/mod_userdir.so
+LoadModule userdir_module modules/mod_userdir.so
<IfModule mod_userdir.c>
# UserDir: The name of the directory which is appended onto a user's home
@@ -12,17 +12,15 @@
# for a site where these directories are restricted to read-only.
#
#<Directory /home/users/*/public_html>
-# AllowOverride FileInfo AuthConfig Limit
-# Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-# <Limit GET POST OPTIONS PROPFIND>
-# Order allow,deny
-# Allow from all
-# </Limit>
-# <LimitExcept GET POST OPTIONS PROPFIND>
-# Order deny,allow
-# Deny from all
-# </LimitExcept>
+# AllowOverride FileInfo AuthConfig Limit
+# Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+# <Limit GET POST OPTIONS PROPFIND>
+# Order allow,deny
+# Allow from all
+# </Limit>
+# <LimitExcept GET POST OPTIONS PROPFIND>
+# Order deny,allow
+# Deny from all
+# </LimitExcept>
#</Directory>
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
Index: SOURCES/apache1-mod_vhost_alias.conf
diff -u SOURCES/apache1-mod_vhost_alias.conf:1.3 SOURCES/apache1-mod_vhost_alias.conf:1.4
--- SOURCES/apache1-mod_vhost_alias.conf:1.3 Sat Jun 18 15:47:44 2005
+++ SOURCES/apache1-mod_vhost_alias.conf Wed Dec 21 14:22:46 2005
@@ -20,5 +20,3 @@
#</VirtualHost>
</IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/apache1-common.conf?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/apache1-errordocs.conf?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SOURCES/apache1-httpd.conf?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_actions.conf?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_alias.conf?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_autoindex.conf?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_cern_meta.conf?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_dir.conf?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_info.conf?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_log_config.conf?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_mime.conf?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_mime_magic.conf?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_negotiation.conf?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_proxy.conf?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_rpaf.conf?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_setenvif.conf?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_ssl.conf?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_status.conf?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_userdir.conf?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_vhost_alias.conf?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list