[gentoo-commits] proj/apache:master commit in: 2.2/conf/modules.d/

[Lars Wendler]

commit:     f8722fceefea5312c7d1a6204f3f6409b4e5e5f6
Author:     Benedikt Boehm <hollow <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 08:32:08 2009 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 08:32:08 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=f8722fce

cleanup IfModule directives

---
 2.2/conf/modules.d/00_apache_manual.conf   |  6 -----
 2.2/conf/modules.d/00_error_documents.conf | 12 ++-------
 2.2/conf/modules.d/00_languages.conf       |  4 ---
 2.2/conf/modules.d/00_mod_autoindex.conf   |  4 +--
 2.2/conf/modules.d/00_mod_info.conf        |  2 --
 2.2/conf/modules.d/00_mod_status.conf      |  2 --
 2.2/conf/modules.d/00_mod_userdir.conf     |  6 -----
 2.2/conf/modules.d/40_mod_ssl.conf         |  2 --
 2.2/conf/modules.d/45_mod_dav.conf         | 41 ++----------------------------
 2.2/conf/modules.d/46_mod_ldap.conf        |  9 -------
 10 files changed, 6 insertions(+), 82 deletions(-)

diff --git a/2.2/conf/modules.d/00_apache_manual.conf b/2.2/conf/modules.d/00_apache_manual.conf
index a424ea7..8825f84 100644
--- a/2.2/conf/modules.d/00_apache_manual.conf
+++ b/2.2/conf/modules.d/00_apache_manual.conf
@@ -3,9 +3,6 @@
 # The documentation is always available at
 #  http://httpd.apache.org/docs/2.2/
 <IfDefine MANUAL>
-<IfModule alias_module>
-<IfModule setenvif_module>
-<IfModule negotiation_module>
 AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-VERSION/manual$1"
 
 <Directory "/usr/share/doc/apache-VERSION/manual">
@@ -24,9 +21,6 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apac
 	LanguagePriority en de es fr ja ko pt-br
 	ForceLanguagePriority Prefer Fallback
 </Directory>
-</IfModule>
-</IfModule>
-</IfModule>
 </IfDefine>
 
 # vim: ts=4 filetype=apache

diff --git a/2.2/conf/modules.d/00_error_documents.conf b/2.2/conf/modules.d/00_error_documents.conf
index 9090026..815668f 100644
--- a/2.2/conf/modules.d/00_error_documents.conf
+++ b/2.2/conf/modules.d/00_error_documents.conf
@@ -23,13 +23,9 @@
 # of the setting of ServerSignature.
 
 <IfDefine ERRORDOCS>
-<IfModule alias_module>
-<IfModule mime_module>
-<IfModule negotiation_module>
+Alias /error/ "/usr/share/apache2/error/"
 
-Alias /error/ "/var/www/localhost/error/"
-
-<Directory "/var/www/localhost/error">
+<Directory "/usr/share/apache2/error">
 	AllowOverride None
 	Options IncludesNoExec
 	AddOutputFilter Includes html
@@ -57,10 +53,6 @@ ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
 ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
 ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
 ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
-
-</IfModule>
-</IfModule>
-</IfModule>
 </IfDefine>
 
 # vim: ts=4 filetype=apache

diff --git a/2.2/conf/modules.d/00_languages.conf b/2.2/conf/modules.d/00_languages.conf
index 287f654..c429bf9 100644
--- a/2.2/conf/modules.d/00_languages.conf
+++ b/2.2/conf/modules.d/00_languages.conf
@@ -1,7 +1,5 @@
 # Settings for hosting different languages.
 <IfDefine LANGUAGE>
-<IfModule mime_module>
-<IfModule negotiation_module>
 # DefaultLanguage and AddLanguage allows you to specify the language of
 # a document. You can then use content negotiation to give a browser a
 # file in a language the user can understand.
@@ -130,8 +128,6 @@ AddCharset gb2312			.gb2312 .gb
 AddCharset iso-10646-ucs-2	.ucs-2 .iso-10646-ucs-2
 AddCharset iso-10646-ucs-4	.ucs-4 .iso-10646-ucs-4
 AddCharset shift_jis		.shift_jis .sjis
-</IfModule>
-</IfModule>
 </IfDefine>
 
 # vim: ts=4 filetype=apache

diff --git a/2.2/conf/modules.d/00_mod_autoindex.conf b/2.2/conf/modules.d/00_mod_autoindex.conf
index 2512357..ca2a168 100644
--- a/2.2/conf/modules.d/00_mod_autoindex.conf
+++ b/2.2/conf/modules.d/00_mod_autoindex.conf
@@ -2,9 +2,9 @@
 <IfModule alias_module>
 # We include the /icons/ alias for FancyIndexed directory listings.  If
 # you do not use FancyIndexing, you may comment this out.
-Alias /icons/ "/var/www/localhost/icons/"
+Alias /icons/ "/usr/share/apache2/icons/"
 
-<Directory "/var/www/localhost/icons">
+<Directory "/usr/share/apache2/icons">
 	Options Indexes MultiViews
 	AllowOverride None
 	Order allow,deny

diff --git a/2.2/conf/modules.d/00_mod_info.conf b/2.2/conf/modules.d/00_mod_info.conf
index 53fd7ae..809c223 100644
--- a/2.2/conf/modules.d/00_mod_info.conf
+++ b/2.2/conf/modules.d/00_mod_info.conf
@@ -1,5 +1,4 @@
 <IfDefine INFO>
-<IfModule info_module>
 # Allow remote server configuration reports, with the URL of
 # http://servername/server-info
 <Location /server-info>
@@ -8,7 +7,6 @@
 	Deny from all
 	Allow from 127.0.0.1
 </Location>
-</IfModule>
 </IfDefine>
 
 # vim: ts=4 filetype=apache

diff --git a/2.2/conf/modules.d/00_mod_status.conf b/2.2/conf/modules.d/00_mod_status.conf
index fa90676..edd46a4 100644
--- a/2.2/conf/modules.d/00_mod_status.conf
+++ b/2.2/conf/modules.d/00_mod_status.conf
@@ -1,5 +1,4 @@
 <IfDefine STATUS>
-<IfModule status_module>
 # Allow server status reports generated by mod_status,
 # with the URL of http://servername/server-status
 <Location /server-status>
@@ -13,7 +12,6 @@
 # information (ExtendedStatus On) or just basic information (ExtendedStatus
 # Off) when the "server-status" handler is called.
 ExtendedStatus On
-</IfModule>
 </IfDefine>
 
 # vim: ts=4 filetype=apache

diff --git a/2.2/conf/modules.d/00_mod_userdir.conf b/2.2/conf/modules.d/00_mod_userdir.conf
index 3fb6911..da7d0fb 100644
--- a/2.2/conf/modules.d/00_mod_userdir.conf
+++ b/2.2/conf/modules.d/00_mod_userdir.conf
@@ -1,8 +1,5 @@
 # Settings for user home directories
-
 <IfDefine USERDIR>
-<IfModule userdir_module>
-
 # UserDir: The name of the directory that is appended onto a user's home
 # directory if a ~user request is received.  Note that you must also set
 # the default access control for these directories, as in the example below.
@@ -26,15 +23,12 @@ UserDir public_html
 # Suexec isn't really required to run cgi-scripts, but it's a really good
 # idea if you have multiple users serving websites...
 <IfDefine SUEXEC>
-<IfModule suexec_module>
 <Directory /home/*/public_html/cgi-bin>
 	Options ExecCGI
 	SetHandler cgi-script
 </Directory>
-</IfModule>
 </IfDefine>
 
-</IfModule>
 </IfDefine>
 
 # vim: ts=4 filetype=apache

diff --git a/2.2/conf/modules.d/40_mod_ssl.conf b/2.2/conf/modules.d/40_mod_ssl.conf
index 331783a..3d0a043 100644
--- a/2.2/conf/modules.d/40_mod_ssl.conf
+++ b/2.2/conf/modules.d/40_mod_ssl.conf
@@ -7,7 +7,6 @@ SSLRandomSeed connect builtin
 </IfModule>
 
 <IfDefine SSL>
-<IfModule ssl_module>
 # This is the Apache server configuration file providing SSL support.
 # It contains the configuration directives to instruct the server how to
 # serve pages over an https connection. For detailing information about these 
@@ -59,7 +58,6 @@ SSLSessionCacheTimeout  300
 # Configure the path to the mutual exclusion semaphore the SSL engine uses
 # internally for inter-process synchronization.
 SSLMutex  file:/var/run/ssl_mutex
-</IfModule>
 </IfDefine>
 
 # vim: ts=4 filetype=apache

diff --git a/2.2/conf/modules.d/45_mod_dav.conf b/2.2/conf/modules.d/45_mod_dav.conf
index be3654b..36f6b9c 100644
--- a/2.2/conf/modules.d/45_mod_dav.conf
+++ b/2.2/conf/modules.d/45_mod_dav.conf
@@ -1,45 +1,9 @@
 <IfDefine DAV>
-<IfModule dav_module>
-<IfModule dav_fs_module>
 DavLockDB "/var/lib/dav/lockdb"
 
-# The following example gives DAV write access to a directory called
-# "uploads" under the ServerRoot directory.
-<IfModule alias_module>
-<IfModule auth_digest_module>
-<IfModule authn_file_module>
-Alias /uploads "/var/www/uploads"
-
-<Directory "/var/www/uploads">
-	Dav On
-
-	AuthType Digest
-	AuthName DAV-upload
-
-	# You can use the htdigest program to create the password database:
-	#   htdigest -c "/var/www/.htpasswd-dav" DAV-upload admin
-	AuthUserFile "/var/www/.htpasswd-dav"
-
-	# Allow access from any host
-	Order allow,deny
-	Allow from all
-
-	# Allow universal read-access, but writes are restricted
-	# to the admin user.
-	<LimitExcept GET OPTIONS>
-		require user admin
-	</LimitExcept>
-</Directory>
-</IfModule>
-</IfModule>
-</IfModule>
-
-</IfModule>
-</IfModule>
-
 # The following directives disable redirects on non-GET requests for
-# a directory that does not include the trailing slash.  This fixes a 
-# problem with several clients that do not appropriately handle 
+# a directory that does not include the trailing slash.  This fixes a
+# problem with several clients that do not appropriately handle
 # redirects for folders with DAV methods.
 <IfModule setenvif_module>
 BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
@@ -50,7 +14,6 @@ BrowserMatch "^gnome-vfs/1.0" redirect-carefully
 BrowserMatch "^XML Spy" redirect-carefully
 BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
 </IfModule>
-
 </IfDefine>
 
 # vim: ts=4 filetype=apache

diff --git a/2.2/conf/modules.d/46_mod_ldap.conf b/2.2/conf/modules.d/46_mod_ldap.conf
index 837bc6e..c2893f8 100644
--- a/2.2/conf/modules.d/46_mod_ldap.conf
+++ b/2.2/conf/modules.d/46_mod_ldap.conf
@@ -3,7 +3,6 @@
 # http://localhost/manual/mod/mod_ldap.html
 # http://localhost/manual/mod/mod_auth_ldap.html
 <IfDefine LDAP>
-<IfModule ldap_module>
 LDAPSharedCacheSize	200000
 LDAPCacheEntries	1024
 LDAPCacheTTL		600
@@ -16,14 +15,6 @@ LDAPOpCacheTTL		600
 	Deny from all
 	Allow from 127.0.0.1
 </Location>
-</IfModule>
-</IfDefine>
-
-<IfDefine AUTHNZ_LDAP>
-<IfModule authnz_ldap_module>
-	#AuthLDAPURL ldap://ldap1.airius.com:389/ou=People, o=Airius?uid?sub?(objectClass=*)
-	#require valid-user
-</IfModule>
 </IfDefine>
 
 # vim: ts=4 filetype=apache