From: Frank Brehm <frank@brehm-online.com>
Date: Tue, 18 Jul 2017 10:35:33 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=a124b74549c6f43a2c2f27fc8f7721bb944edf3c;p=config%2Fbruni%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/apache2/httpd.conf b/apache2/httpd.conf
index 0494b0f0..7e8d7230 100644
--- a/apache2/httpd.conf
+++ b/apache2/httpd.conf
@@ -114,9 +114,6 @@ LoadModule file_cache_module modules/mod_file_cache.so
 </IfDefine>
 LoadModule filter_module modules/mod_filter.so
 LoadModule headers_module modules/mod_headers.so
-<IfDefine HTTP2>
-LoadModule http2_module modules/mod_http2.so
-</IfDefine>
 LoadModule ident_module modules/mod_ident.so
 LoadModule imagemap_module modules/mod_imagemap.so
 LoadModule include_module modules/mod_include.so
@@ -191,6 +188,7 @@ LoadModule userdir_module modules/mod_userdir.so
 LoadModule usertrack_module modules/mod_usertrack.so
 LoadModule version_module modules/mod_version.so
 LoadModule vhost_alias_module modules/mod_vhost_alias.so
+LoadModule xml2enc_module modules/mod_xml2enc.so
 
 # If you wish httpd to run as a different user or group, you must run
 # httpd as root initially and it will switch.
diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf
index e06709e0..687d4f28 100644
--- a/apache2/modules.d/00_apache_manual.conf
+++ b/apache2/modules.d/00_apache_manual.conf
@@ -5,9 +5,9 @@
 <IfModule negotiation_module>
 <IfModule setenvif_module>
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.25/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.27/manual$1"
 
-<Directory "/usr/share/doc/apache-2.4.25/manual">
+<Directory "/usr/share/doc/apache-2.4.27/manual">
 	Options Indexes
 	AllowOverride None
 	Require all granted