diff options
Diffstat (limited to 'main/apache2/conf/0011-httpd.conf-IncludeOptional.patch')
| -rw-r--r-- | main/apache2/conf/0011-httpd.conf-IncludeOptional.patch | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/main/apache2/conf/0011-httpd.conf-IncludeOptional.patch b/main/apache2/conf/0011-httpd.conf-IncludeOptional.patch index 1a8056989d..bc38c2753c 100644 --- a/main/apache2/conf/0011-httpd.conf-IncludeOptional.patch +++ b/main/apache2/conf/0011-httpd.conf-IncludeOptional.patch @@ -1,21 +1,22 @@ -From 537f190142ce17f01db06d0f9cdd4c8b163eee9c Mon Sep 17 00:00:00 2001 +From 1013806f1128c2cf289b20362484f64379dda619 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> Date: Fri, 11 Sep 2015 11:27:24 +0300 Subject: [PATCH 11/14] httpd.conf: IncludeOptional --- - docs/conf/httpd.conf.in | 46 +++------------------------------------------- - 1 file changed, 3 insertions(+), 43 deletions(-) + 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 47fe513..545e663 100644 +index de6ee33..66d20fe 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in -@@ -373,50 +373,10 @@ LogLevel warn +@@ -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 @@ -56,15 +57,7 @@ index 47fe513..545e663 100644 -<IfModule proxy_html_module> -Include @rel_sysconfdir@/extra/proxy-html.conf -</IfModule> -- --# Secure (SSL/TLS) connections --#Include @rel_sysconfdir@/extra/httpd-ssl.conf -+# Load config files from the config directory "/etc/apache2/conf.d". -+# +IncludeOptional /etc/apache2/conf.d/*.conf - - # - # uncomment out the below to deal with user agents that deliberately -- 2.5.0 |