From 1013806f1128c2cf289b20362484f64379dda619 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 11 Sep 2015 11:27:24 +0300 Subject: [PATCH 11/14] httpd.conf: IncludeOptional --- docs/conf/httpd.conf.in | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in index de6ee33..66d20fe 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in @@ -373,44 +373,6 @@ LogLevel warn #EnableMMAP off #EnableSendfile on -# Supplemental configuration +# Load config files from the config directory "/etc/apache2/conf.d". # -# The configuration files in the @rel_sysconfdir@/extra/ directory can be -# included to add extra features or to modify the default configuration of -# the server, or you may simply copy their contents here and change as -# necessary. - -# Server-pool management (MPM specific) -#Include @rel_sysconfdir@/extra/httpd-mpm.conf - -# Multi-language error messages -#Include @rel_sysconfdir@/extra/httpd-multilang-errordoc.conf - -# Fancy directory listings -#Include @rel_sysconfdir@/extra/httpd-autoindex.conf - -# Language settings -#Include @rel_sysconfdir@/extra/httpd-languages.conf - -# User home directories -#Include @rel_sysconfdir@/extra/httpd-userdir.conf - -# Real-time info on requests and configuration -#Include @rel_sysconfdir@/extra/httpd-info.conf - -# Virtual hosts -#Include @rel_sysconfdir@/extra/httpd-vhosts.conf - -# Local access to the Apache HTTP Server Manual -#Include @rel_sysconfdir@/extra/httpd-manual.conf - -# Distributed authoring and versioning (WebDAV) -#Include @rel_sysconfdir@/extra/httpd-dav.conf - -# Various default settings -#Include @rel_sysconfdir@/extra/httpd-default.conf - -# Configure mod_proxy_html to understand HTML4/XHTML1 - -Include @rel_sysconfdir@/extra/proxy-html.conf - +IncludeOptional /etc/apache2/conf.d/*.conf -- 2.5.0