mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-12-25 03:12:08 +01:00
64 lines
2.0 KiB
Diff
64 lines
2.0 KiB
Diff
From 355485ecb874640c0856e4f3c239d517d97893df 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 | 42 ++----------------------------------------
|
|
1 file changed, 2 insertions(+), 40 deletions(-)
|
|
|
|
diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
|
|
index 46ccea6..388916f 100644
|
|
--- a/docs/conf/httpd.conf.in
|
|
+++ b/docs/conf/httpd.conf.in
|
|
@@ -382,44 +382,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
|
|
-<IfModule proxy_html_module>
|
|
-Include @rel_sysconfdir@/extra/proxy-html.conf
|
|
-</IfModule>
|
|
+IncludeOptional /etc/apache2/conf.d/*.conf
|
|
--
|
|
2.9.4
|
|
|