- vim modelines not needed (vim patched to be smart)

Changed files:
    apache1-common.conf -> 1.4
    apache1-errordocs.conf -> 1.5
    apache1-httpd.conf -> 1.13
    apache1-mod_actions.conf -> 1.2
    apache1-mod_alias.conf -> 1.3
    apache1-mod_autoindex.conf -> 1.4
    apache1-mod_cern_meta.conf -> 1.2
    apache1-mod_dir.conf -> 1.2
    apache1-mod_info.conf -> 1.2
    apache1-mod_log_config.conf -> 1.4
    apache1-mod_mime.conf -> 1.2
    apache1-mod_mime_magic.conf -> 1.2
    apache1-mod_negotiation.conf -> 1.2
    apache1-mod_proxy.conf -> 1.4
    apache1-mod_setenvif.conf -> 1.3
    apache1-mod_status.conf -> 1.3
    apache1-mod_userdir.conf -> 1.2
    apache1-mod_vhost_alias.conf -> 1.4

diff --git a/apache1-common.conf b/apache1-common.conf
index 111ef1f47d4c3fc0e19973462aeb4126658ca2c2..dce5f013546e150719eb2efdcea4885cd6c1faee 100644 (file)
--- a/apache1-common.conf
+++ b/apache1-common.conf
@@ -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 @@ DocumentRoot "/home/services/apache/html"
 <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

diff --git a/apache1-errordocs.conf b/apache1-errordocs.conf
index 3e884949875cada8ed461bbfe9dcca1a9c97f07f..c396ff292b942f3c4bd43672c6e37b9e0574aa1d 100644 (file)
--- a/apache1-errordocs.conf
+++ b/apache1-errordocs.conf
@@ -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 414     /errordocs/414.shtml
 ErrorDocument 500      /errordocs/500.shtml
 ErrorDocument 503      /errordocs/503.shtml
 </IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et

diff --git a/apache1-httpd.conf b/apache1-httpd.conf
index 3d62269ccf25fd8034244993585a046776519c45..7d12f0c04aaa28748eb18e993d92eaca7fe96f43 100644 (file)
--- a/apache1-httpd.conf
+++ b/apache1-httpd.conf
@@ -11,7 +11,7 @@ ServerType standalone
 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 @@ MaxClients 150
 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

diff --git a/apache1-mod_actions.conf b/apache1-mod_actions.conf
index 5e27c5157632be8871f0db5470ee05c0352429f9..4b9928ee0f8c80c38fdc266e15a5d9146500e2d3 100644 (file)
--- a/apache1-mod_actions.conf
+++ b/apache1-mod_actions.conf
@@ -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

diff --git a/apache1-mod_alias.conf b/apache1-mod_alias.conf
index 588ee3bcc9a8ac77fa73d0c5664ef7956f63cb88..517b1f9cf31be1b219566d50440dff21dc642e59 100644 (file)
--- a/apache1-mod_alias.conf
+++ b/apache1-mod_alias.conf
@@ -52,5 +52,3 @@ ScriptAlias /cgi-bin/ "/home/services/apache/cgi-bin/"
 # clients where to look for the relocated document.
 # Format: Redirect old-URI new-URL
 </IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et

diff --git a/apache1-mod_autoindex.conf b/apache1-mod_autoindex.conf
index 0cde42f4cfe65243c6cca89de1bad6ed75ebff07..2135f991b52e2e4d522cba2f8dde9cfd0f3388a7 100644 (file)
--- a/apache1-mod_autoindex.conf
+++ b/apache1-mod_autoindex.conf
@@ -83,5 +83,3 @@ LoadModule autoindex_module modules/mod_autoindex.so
        IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
 
 </IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et

diff --git a/apache1-mod_cern_meta.conf b/apache1-mod_cern_meta.conf
index 68b2a328f99d2afaeae5f09399bf2f8efac98b4f..222be7bfde659711ac22bba17ca4b090f5c86712 100644 (file)
--- a/apache1-mod_cern_meta.conf
+++ b/apache1-mod_cern_meta.conf
@@ -14,5 +14,3 @@ MetaDir .web
 #
 MetaSuffix .meta
 </IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et

diff --git a/apache1-mod_dir.conf b/apache1-mod_dir.conf
index 7556c9efdaaa4bf8b8ca77b6f4c9e457530cbffd..8673a5bfdd9abd49d780513a86ae564b1b80bf0f 100644 (file)
--- a/apache1-mod_dir.conf
+++ b/apache1-mod_dir.conf
@@ -7,5 +7,3 @@ LoadModule dir_module modules/mod_dir.so
 <IfModule mod_dir.c>
        DirectoryIndex index.html index.htm index.shtml index.cgi index.php
 </IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et

diff --git a/apache1-mod_info.conf b/apache1-mod_info.conf
index 1d38ebaf9934e38ad19e5a2d49a6be76b73bc073..81c20514778b4e3c4b7fd8a1ae55d60ce8495b24 100644 (file)
--- a/apache1-mod_info.conf
+++ b/apache1-mod_info.conf
@@ -5,13 +5,10 @@ LoadModule info_module modules/mod_info.so
 # 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

diff --git a/apache1-mod_log_config.conf b/apache1-mod_log_config.conf
index 20bf48db8f9e31ce70037c1700dedd8edee88f10..59941420c2b5ce0aa4f92be56a2d4834f4f6d867 100644 (file)
--- a/apache1-mod_log_config.conf
+++ b/apache1-mod_log_config.conf
@@ -14,5 +14,3 @@ LoadModule log_config_module  modules/mod_log_config.so
        CustomLog logs/referer_log referer
        CustomLog logs/agent_log agent
 </IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et

diff --git a/apache1-mod_mime.conf b/apache1-mod_mime.conf
index fd20525f4e408955a05cbeae5dcb50414f396a7b..a56fb44992a70ba970f0ff26c6eac41fa59f733b 100644 (file)
--- a/apache1-mod_mime.conf
+++ b/apache1-mod_mime.conf
@@ -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 imap-file map
 AddHandler type-map var
 
 </IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et

diff --git a/apache1-mod_mime_magic.conf b/apache1-mod_mime_magic.conf
index 3879a529045694a4cb28b80726b2df2519ebfbc3..91bc18a3064c46b9c46051750d3310ebd38e7ca5 100644 (file)
--- a/apache1-mod_mime_magic.conf
+++ b/apache1-mod_mime_magic.conf
@@ -14,5 +14,3 @@ LoadModule mime_magic_module  modules/mod_mime_magic.so
 
 MIMEMagicFile /etc/apache/magic
 </IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et

diff --git a/apache1-mod_negotiation.conf b/apache1-mod_negotiation.conf
index 3ec24b9f2159b0b1f45d97022b391a478fda4264..b6fedd5a765b907dc985f7e6c91b124f0ce6bd58 100644 (file)
--- a/apache1-mod_negotiation.conf
+++ b/apache1-mod_negotiation.conf
@@ -16,5 +16,3 @@ LoadModule negotiation_module modules/mod_negotiation.so
 #
 LanguagePriority en pl fr de
 </IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et

diff --git a/apache1-mod_proxy.conf b/apache1-mod_proxy.conf
index 13198e92215fdf63567067f78a9a6aa6232fac1c..c05fa04a7e11b7f499d67f7137ea97af2a460a05 100644 (file)
--- a/apache1-mod_proxy.conf
+++ b/apache1-mod_proxy.conf
@@ -37,5 +37,3 @@ ProxyIOBufferSize 8192
 ProxyReceiveBufferSize 2048
 
 </IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et

diff --git a/apache1-mod_setenvif.conf b/apache1-mod_setenvif.conf
index 57089507278e037196a226b611f2d04e2cfe2372..d55e5c0f17ae7c2ba802f17b795d295f8ece119b 100644 (file)
--- a/apache1-mod_setenvif.conf
+++ b/apache1-mod_setenvif.conf
@@ -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 "RealPlayer 4\.0" force-response-1.0
 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

diff --git a/apache1-mod_status.conf b/apache1-mod_status.conf
index 23c97bf2345551942f0569c9b23e5be216e075bd..262eb6427a8a8f128f2c964b25c46386b97e2b2b 100644 (file)
--- a/apache1-mod_status.conf
+++ b/apache1-mod_status.conf
@@ -20,5 +20,3 @@ LoadModule status_module modules/mod_status.so
 #ExtendedStatus On
 
 </IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et

diff --git a/apache1-mod_userdir.conf b/apache1-mod_userdir.conf
index 450e62bb47c66a3ecbadbb9cda4dab9cf9aed05b..2255e882e388cdc64310a2f8e2a47e2e5a2d4ba3 100644 (file)
--- a/apache1-mod_userdir.conf
+++ b/apache1-mod_userdir.conf
@@ -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 @@ UserDir public_html
 # 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

diff --git a/apache1-mod_vhost_alias.conf b/apache1-mod_vhost_alias.conf
index b5c0590346473ae05a5c58714030d88ea7d15a29..4bdd660733dd7597d3dc41379b8cdf0c772b2fbe 100644 (file)
--- a/apache1-mod_vhost_alias.conf
+++ b/apache1-mod_vhost_alias.conf
@@ -20,5 +20,3 @@ LoadModule vhost_alias_module modules/mod_vhost_alias.so
 #</VirtualHost>
 
 </IfModule>
-
-# vim: filetype=apache ts=4 sw=4 et