| 1 | From 355485ecb874640c0856e4f3c239d517d97893df Mon Sep 17 00:00:00 2001
|
| 2 | From: Kaarle Ritvanen <[email protected]>
|
| 3 | Date: Fri, 11 Sep 2015 11:27:24 +0300
|
| 4 | Subject: [PATCH 11/14] httpd.conf: IncludeOptional
|
| 5 |
|
| 6 | ---
|
| 7 | docs/conf/httpd.conf.in | 42 ++----------------------------------------
|
| 8 | 1 file changed, 2 insertions(+), 40 deletions(-)
|
| 9 |
|
| 10 | diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
|
| 11 | index 46ccea6..388916f 100644
|
| 12 | |
| 13 | |
| 14 | @@ -382,44 +382,6 @@ LogLevel warn
|
| 15 | #EnableMMAP off
|
| 16 | #EnableSendfile on
|
| 17 |
|
| 18 | -# Supplemental configuration
|
| 19 | +# Load config files from the config directory "/etc/apache2/conf.d".
|
| 20 | #
|
| 21 | -# The configuration files in the @rel_sysconfdir@/extra/ directory can be
|
| 22 | -# included to add extra features or to modify the default configuration of
|
| 23 | -# the server, or you may simply copy their contents here and change as
|
| 24 | -# necessary.
|
| 25 | -
|
| 26 | -# Server-pool management (MPM specific)
|
| 27 | -#Include @rel_sysconfdir@/extra/httpd-mpm.conf
|
| 28 | -
|
| 29 | -# Multi-language error messages
|
| 30 | -#Include @rel_sysconfdir@/extra/httpd-multilang-errordoc.conf
|
| 31 | -
|
| 32 | -# Fancy directory listings
|
| 33 | -#Include @rel_sysconfdir@/extra/httpd-autoindex.conf
|
| 34 | -
|
| 35 | -# Language settings
|
| 36 | -#Include @rel_sysconfdir@/extra/httpd-languages.conf
|
| 37 | -
|
| 38 | -# User home directories
|
| 39 | -#Include @rel_sysconfdir@/extra/httpd-userdir.conf
|
| 40 | -
|
| 41 | -# Real-time info on requests and configuration
|
| 42 | -#Include @rel_sysconfdir@/extra/httpd-info.conf
|
| 43 | -
|
| 44 | -# Virtual hosts
|
| 45 | -#Include @rel_sysconfdir@/extra/httpd-vhosts.conf
|
| 46 | -
|
| 47 | -# Local access to the Apache HTTP Server Manual
|
| 48 | -#Include @rel_sysconfdir@/extra/httpd-manual.conf
|
| 49 | -
|
| 50 | -# Distributed authoring and versioning (WebDAV)
|
| 51 | -#Include @rel_sysconfdir@/extra/httpd-dav.conf
|
| 52 | -
|
| 53 | -# Various default settings
|
| 54 | -#Include @rel_sysconfdir@/extra/httpd-default.conf
|
| 55 | -
|
| 56 | -# Configure mod_proxy_html to understand HTML4/XHTML1
|
| 57 | -<IfModule proxy_html_module>
|
| 58 | -Include @rel_sysconfdir@/extra/proxy-html.conf
|
| 59 | -</IfModule>
|
| 60 | +IncludeOptional /etc/apache2/conf.d/*.conf
|
| 61 | --
|
| 62 | 2.9.4
|
| 63 |
|