saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 024b2eedbe0b7043bcadd4d0d7bd198d95d44d54..77dc3fd99e1e7bbdbe639f21e53c2cb0808b8416 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -76,6 +76,7 @@ maybe chmod 0644 'apache2/httpd.conf'
 maybe chmod 0644 'apache2/info_users_passwd'
 maybe chmod 0644 'apache2/magic'
 maybe chmod 0755 'apache2/modules.d'
+maybe chmod 0644 'apache2/modules.d/._cfg0000_00_apache_manual.conf'
 maybe chmod 0644 'apache2/modules.d/.keep_dev-vcs_subversion-0'
 maybe chmod 0644 'apache2/modules.d/.keep_www-servers_apache-2'
 maybe chmod 0644 'apache2/modules.d/00_apache_manual.conf'

diff --git a/apache2/modules.d/._cfg0000_00_apache_manual.conf b/apache2/modules.d/._cfg0000_00_apache_manual.conf
new file mode 100644 (file)
index 0000000..c1ddd15
--- /dev/null
+++ b/apache2/modules.d/._cfg0000_00_apache_manual.conf
@@ -0,0 +1,29 @@
+# Provide access to the documentation on your server as
+#  http://yourserver.example.com/manual/
+# The documentation is always available at
+#  http://httpd.apache.org/docs/2.4/
+<IfModule negotiation_module>
+<IfModule setenvif_module>
+<IfDefine MANUAL>
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.23/manual$1"
+
+<Directory "/usr/share/doc/apache-2.4.23/manual">
+       Options Indexes
+       AllowOverride None
+       Require all granted
+
+       <Files *.html>
+               SetHandler type-map
+       </Files>
+
+       SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br)/ prefer-language=$1
+       RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br)){2,}(/.*)?$ /manual/$1$2
+
+       LanguagePriority en de es fr ja ko pt-br
+       ForceLanguagePriority Prefer Fallback
+</Directory>
+</IfDefine>
+</IfModule>
+</IfModule>
+
+# vim: ts=4 filetype=apache