Add APACHE2_MODULES and APACHE2_MPMS to USE_EXPAND

4 files changed, 90 insertions, 3 deletions

diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index c9dee7de85ea..f139a549c4b8 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.23 2007/11/21 00:22:12 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.24 2007/11/28 07:50:44 hollow Exp $
+
+  28 Nov 2007; Benedikt Böhm <hollow@gentoo.org> make.defaults:
+  Add APACHE2_MODULES and APACHE2_MPMS to USE_EXPAND
 
   21 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org> virtuals:
   Removed virtual/lapack, now new style
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 8a466d703b30..882552343d2a 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.36 2007/07/14 19:51:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.37 2007/11/28 07:50:44 hollow Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -10,7 +10,7 @@ FEATURES="strict sfperms"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org.
-USE_EXPAND="FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS"
+USE_EXPAND="APACHE2_MODULES APACHE2_MPMS FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
@@ -29,6 +29,10 @@ INPUT_DEVICES="keyboard mouse"
 # Build everything for the average user
 ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mulaw multi null plug rate route share shm softvol"
 
+# Benedikt Böhm <hollow@gentoo.org> (27 Nov 2007)
+# Sane defaults for built-in apache modules
+APACHE2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias"
+
 # Robert Buchholz <rbu@gentoo.org> (17 Jan 2006)
 # Some common lcd devices
 LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text"
diff --git a/profiles/desc/apache2_modules.desc b/profiles/desc/apache2_modules.desc
new file mode 100644
index 000000000000..cf2d8f2b4750
--- /dev/null
+++ b/profiles/desc/apache2_modules.desc
@@ -0,0 +1,68 @@
+# Copyright 2007 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/apache2_modules.desc,v 1.1 2007/11/28 07:50:44 hollow Exp $
+
+# This file contains descriptions of APACHE2_MODULES USE_EXPAND flags.
+
+# Keep it sorted.
+actions - Provides for executing CGI scripts based on media type or request method
+alias - Provides for mapping different parts of the host filesystem in the document tree and for URL redirection
+asis - Sends files that contain their own HTTP headers
+auth_basic - Basic authentication
+auth_digest - User authentication using MD5 Digest Authentication
+authn_alias - Provides the ability to create extended authentication providers based on actual providers
+authn_anon - Allows "anonymous" user access to authenticated areas
+authn_dbd - User authentication using an SQL database
+authn_dbm - User authentication using DBM files
+authn_default - Authentication fallback module
+authn_file - User authentication using text files
+authz_dbm - Group authorization using DBM files
+authz_default - Authorization fallback module
+authz_groupfile - Group authorization using plaintext files
+authz_host - Group authorizations based on host (name or IP address)
+authz_owner - Authorization based on file ownership
+authz_user - User Authorization
+autoindex - Generates directory indexes, automatically, similar to the Unix ls command
+cache - Content cache keyed to URIs
+cern_meta - CERN httpd metafile semantics
+charset_lite - Specify character set translation or recoding
+dav - Distributed Authoring and Versioning (WebDAV) functionality
+dav_fs - filesystem provider for mod_dav
+dav_lock - generic locking module for mod_dav
+dbd - Manages SQL database connections
+deflate - Compress content before it is delivered to the client
+dir - Provides for "trailing slash" redirects and serving directory index files
+disk_cache - Content cache storage manager keyed to URIs
+dumpio - Dumps all I/O to error log as desired
+env - Modifies the environment which is passed to CGI scripts and SSI pages
+expires - Generation of Expires and Cache-Control HTTP headers according to user-specified criteria
+ext_filter - Pass the response body through an external program before delivery to the client
+file_cache - Caches a static list of files in memory
+filter - Context-sensitive smart filter configuration module
+headers - Customization of HTTP request and response headers
+ident - RFC 1413 ident lookups
+imagemap - Server-side imagemap processing
+include - Server-parsed html documents (Server Side Includes)
+info - Provides a comprehensive overview of the server configuration
+log_config - Logging of the requests made to the server
+log_forensic - Forensic Logging of the requests made to the server
+logio - Logging of input and output bytes per request
+mem_cache - Content cache keyed to URIs
+mime - Associates the requested filename's extensions with the file's behavior (handlers and filters) and content (mime-type, language, character set and encoding)
+mime_magic - Determines the MIME type of a file by looking at a few bytes of its contents
+negotiation - Provides for content negotiation
+proxy - HTTP/1.1 proxy/gateway server
+proxy_ajp - AJP support module for mod_proxy
+proxy_balancer - mod_proxy extension for load balancing
+proxy_connect - mod_proxy extension for CONNECT request handling
+proxy_ftp - FTP support module for mod_proxy
+proxy_http - HTTP support module for mod_proxy
+rewrite - Provides a rule-based rewriting engine to rewrite requested URLs on the fly
+setenvif - Allows the setting of environment variables based on characteristics of the request
+speling - Attempts to correct mistaken URLs that users might have entered by ignoring capitalization and by allowing up to one misspelling
+status - Provides information on server activity and performance
+unique_id - Provides an environment variable with a unique identifier for each request
+userdir - User-specific directories
+usertrack - Clickstream logging of user activity on a site
+version - Version dependent configuration
+vhost_alias - Provides for dynamically configured mass virtual hosting
diff --git a/profiles/desc/apache2_mpms.desc b/profiles/desc/apache2_mpms.desc
new file mode 100644
index 000000000000..ade11a097d3b
--- /dev/null
+++ b/profiles/desc/apache2_mpms.desc
@@ -0,0 +1,12 @@
+# Copyright 2007 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/apache2_mpms.desc,v 1.1 2007/11/28 07:50:44 hollow Exp $
+
+# This file contains descriptions of APACHE2_MPMS USE_EXPAND flags.
+
+# Keep it sorted.
+event - An experimental variant of the standard worker MPM
+itk - Allows to run each virtual host under a separate uid and gid
+peruser - Peruser is a working implementation of the perchild MPM allowing to run each apache child process as its own user and group, each handling its own set of virtual hosts
+prefork - Implements a non-threaded, pre-forking web server
+worker - Multi-Processing Module implementing a hybrid multi-threaded multi-process web server