apache2 2.4.* configuration update

1 files changed, 93 insertions, 142 deletions

diff --git a/server/setup/05-service-settings/etc/apache2/apache2.conf b/server/setup/05-service-settings/etc/apache2/apache2.conf
index d1991c9..42afd0b 100644
--- a/server/setup/05-service-settings/etc/apache2/apache2.conf
+++ b/server/setup/05-service-settings/etc/apache2/apache2.conf
@@ -1,8 +1,8 @@
 # This is the main Apache server configuration file.  It contains the
 # configuration directives that give the server its instructions.
-# See http://httpd.apache.org/docs/2.2/ for detailed information about
-# the directives and /usr/share/doc/apache2-common/README.Debian.gz about
-# Debian specific hints.
+# See http://httpd.apache.org/docs/2.4/ for detailed information about
+# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
+# hints.
 #
 #
 # Summary of how the Apache 2 configuration works in Debian:
@@ -22,45 +22,30 @@
 #	|-- mods-enabled
 #	|	|-- *.load
 #	|	`-- *.conf
-#	|-- conf.d
-#	|	`-- *
+#	|-- conf-enabled
+#	|	`-- *.conf
 # 	`-- sites-enabled
-#	 	`-- *
+#	 	`-- *.conf
 #
 #
 # * apache2.conf is the main configuration file (this file). It puts the pieces
 #   together by including all remaining configuration files when starting up the
 #   web server.
 #
-#   In order to avoid conflicts with backup files, the Include directive is
-#   adapted to ignore files that:
-#   - do not begin with a letter or number
-#   - contain a character that is neither letter nor number nor _-:.
-#   - contain .dpkg
-#
-#   Yet we strongly suggest that all configuration files either end with a
-#   .conf or .load suffix in the file name. The next Debian release will
-#   ignore files not ending with .conf (or .load for mods-enabled).
-#
 # * ports.conf is always included from the main configuration file. It is
-#   supposed to determine listening ports for incoming connections, and which
-#   of these ports are used for name based virtual hosts.
+#   supposed to determine listening ports for incoming connections which can be
+#   customized anytime.
 #
-# * Configuration files in the mods-enabled/ and sites-enabled/ directories
-#   contain particular configuration snippets which manage modules or virtual
-#   host configurations, respectively.
+# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
+#   directories contain particular configuration snippets which manage modules,
+#   global configuration fragments, or virtual host configurations,
+#   respectively.
 #
 #   They are activated by symlinking available configuration files from their
 #   respective *-available/ counterparts. These should be managed by using our
-#   helpers a2enmod/a2dismod, a2ensite/a2dissite. See
+#   helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See
 #   their respective man pages for detailed information.
 #
-# * Configuration files in the conf.d directory are either provided by other
-#   packages or may be added by the local administrator. Local additions
-#   should start with local- or end with .local.conf to avoid name clashes. All
-#   files in conf.d are considered (excluding the exceptions noted above) by
-#   the Apache 2 web server.
-#
 # * The binary is called apache2. Due to the use of environment variables, in
 #   the default configuration, apache2 needs to be started/stopped with
 #   /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
@@ -75,8 +60,8 @@
 # configuration, error, and log files are kept.
 #
 # NOTE!  If you intend to place this on an NFS (or otherwise network)
-# mounted filesystem then please read the LockFile documentation (available
-# at <URL:http://httpd.apache.org/docs/2.2/mod/mpm_common.html#lockfile>);
+# mounted filesystem then please read the Mutex documentation (available
+# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
 # you will save yourself a lot of trouble.
 #
 # Do NOT add a slash at the end of the directory path.
@@ -86,7 +71,13 @@
 #
 # The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
 #
-LockFile ${APACHE_LOCK_DIR}/accept.lock
+Mutex file:${APACHE_LOCK_DIR} default
+
+#
+# The directory where shm and other runtime files will be stored.
+#
+
+DefaultRuntimeDir ${APACHE_RUN_DIR}
 
 #
 # PidFile: The file in which the server should record its process
@@ -117,114 +108,15 @@ MaxKeepAliveRequests 100
 # KeepAliveTimeout: Number of seconds to wait for the next request from the
 # same client on the same connection.
 #
-# default: 5
+#KeepAliveTimeout 5
 KeepAliveTimeout 10
 
 
-##
-## Server-Pool Size Regulation (MPM specific)
-## 
-
-# prefork MPM
-# StartServers: number of server processes to start
-# MinSpareServers: minimum number of server processes which are kept spare
-# MaxSpareServers: maximum number of server processes which are kept spare
-# MaxClients: maximum number of server processes allowed to start
-# MaxRequestsPerChild: maximum number of requests a server process serves
-<IfModule mpm_prefork_module>
-    # defaults:
-    # StartServers          5
-    # MinSpareServers       5
-    # MaxSpareServers      10
-    # MaxClients          150
-    # MaxRequestsPerChild   0
-
-    StartServers          8
-    MinSpareServers       5
-    MaxSpareServers      20
-    MaxClients          256
-    MaxRequestsPerChild   0
-</IfModule>
-
-# worker MPM
-# StartServers: initial number of server processes to start
-# MinSpareThreads: minimum number of worker threads which are kept spare
-# MaxSpareThreads: maximum number of worker threads which are kept spare
-# ThreadLimit: ThreadsPerChild can be changed to this maximum value during a
-#              graceful restart. ThreadLimit can only be changed by stopping
-#              and starting Apache.
-# ThreadsPerChild: constant number of worker threads in each server process
-# MaxClients: maximum number of simultaneous client connections
-# MaxRequestsPerChild: maximum number of requests a server process serves
-<IfModule mpm_worker_module>
-    StartServers          2
-    MinSpareThreads      25
-    MaxSpareThreads      75 
-    ThreadLimit          64
-    ThreadsPerChild      25
-    MaxClients          150
-    MaxRequestsPerChild   0
-</IfModule>
-
-# event MPM
-# StartServers: initial number of server processes to start
-# MinSpareThreads: minimum number of worker threads which are kept spare
-# MaxSpareThreads: maximum number of worker threads which are kept spare
-# ThreadsPerChild: constant number of worker threads in each server process
-# MaxClients: maximum number of simultaneous client connections
-# MaxRequestsPerChild: maximum number of requests a server process serves
-<IfModule mpm_event_module>
-    StartServers          2
-    MinSpareThreads      25
-    MaxSpareThreads      75 
-    ThreadLimit          64
-    ThreadsPerChild      25
-    MaxClients          150
-    MaxRequestsPerChild   0
-</IfModule>
-
 # These need to be set in /etc/apache2/envvars
 User ${APACHE_RUN_USER}
 Group ${APACHE_RUN_GROUP}
 
 #
-# AccessFileName: The name of the file to look for in each directory
-# for additional configuration directives.  See also the AllowOverride
-# directive.
-#
-
-AccessFileName .htaccess
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being 
-# viewed by Web clients. 
-#
-<Files ~ "^\.ht">
-    Order allow,deny
-    Deny from all
-    Satisfy all
-</Files>
-
-#
-# DefaultType is the default MIME type the server will use for a document
-# if it cannot otherwise determine one, such as from filename extensions.
-# If your server contains mostly text or HTML documents, "text/plain" is
-# a good value.  If most of your content is binary, such as applications
-# or images, you may want to use "application/octet-stream" instead to
-# keep browsers from trying to display binary files as though they are
-# text.
-#
-# It is also possible to omit any default MIME type and let the
-# client's browser guess an appropriate action instead. Typically the
-# browser will decide based on the file's extension then. In cases
-# where no good assumption can be made, letting the default MIME type
-# unset is suggested  instead of forcing the browser to accept
-# incorrect  metadata.
-#
-DefaultType None
-
-
-#
 # HostnameLookups: Log the names of clients or just their IP addresses
 # e.g., www.apache.org (on) or 204.62.129.132 (off).
 # The default is off because it'd be overall better for the net if people
@@ -243,23 +135,80 @@ HostnameLookups Off
 ErrorLog ${APACHE_LOG_DIR}/error.log
 
 #
-# LogLevel: Control the number of messages logged to the error_log.
-# Possible values include: debug, info, notice, warn, error, crit,
-# alert, emerg.
+# LogLevel: Control the severity of messages logged to the error_log.
+# Available values: trace8, ..., trace1, debug, info, notice, warn,
+# error, crit, alert, emerg.
+# It is also possible to configure the log level for particular modules, e.g.
+# "LogLevel info ssl:warn"
 #
 LogLevel warn
 
 # Include module configuration:
-Include mods-enabled/*.load
-Include mods-enabled/*.conf
+IncludeOptional mods-enabled/*.load
+IncludeOptional mods-enabled/*.conf
 
-# Include list of ports to listen on and which to use for name based vhosts
+# Include list of ports to listen on
 Include ports.conf
 
+
+# Sets the default security model of the Apache2 HTTPD server. It does
+# not allow access to the root filesystem outside of /usr/share and /var/www.
+# The former is used by web applications packaged in Debian,
+# the latter may be used for local directories served by the web server. If
+# your system is serving content from a sub-directory in /srv you must allow
+# access here, or in any related virtual host.
+<Directory />
+	Options FollowSymLinks
+	AllowOverride None
+	Require all denied
+</Directory>
+
+<Directory /usr/share>
+	AllowOverride None
+	Require all granted
+</Directory>
+
+<Directory /var/www/>
+	Options Indexes FollowSymLinks
+	AllowOverride None
+	Require all granted
+</Directory>
+
+#<Directory /srv/>
+#	Options Indexes FollowSymLinks
+#	AllowOverride None
+#	Require all granted
+#</Directory>
+
+
+
+
+# AccessFileName: The name of the file to look for in each directory
+# for additional configuration directives.  See also the AllowOverride
+# directive.
+#
+AccessFileName .htaccess
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being
+# viewed by Web clients.
+#
+<FilesMatch "^\.ht">
+	Require all denied
+</FilesMatch>
+
+
 #
 # The following directives define some format nicknames for use with
-# a CustomLog directive (see below).
-# If you are behind a reverse proxy, you might want to change %h into %{X-Forwarded-For}i
+# a CustomLog directive.
+#
+# These deviate from the Common Log Format definitions in that they use %O
+# (the actual bytes sent including headers) instead of %b (the size of the
+# requested file), because the latter makes it impossible to detect partial
+# requests.
+#
+# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended.
+# Use mod_remoteip instead.
 #
 LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
 LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
@@ -268,10 +217,12 @@ LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
 
 # Include of directories ignores editors' and dpkg's backup files,
-# see the comments above for details.
+# see README.Debian for details.
 
 # Include generic snippets of statements
-Include conf.d/
+IncludeOptional conf-enabled/*.conf
 
 # Include the virtual host configurations:
-Include sites-enabled/
+IncludeOptional sites-enabled/*.conf
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet