From: fbrehm <fbrehm@samara.profitbricks.localdomain>
Date: Mon, 23 Apr 2012 11:18:14 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=0fd492657017cc2916442c4553e6acbcd19b13c0;p=config%2Fsamara%2Fetc.git

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

diff --git a/.etckeeper b/.etckeeper
index 5f4e38d..0ed8648 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -148,6 +148,7 @@ maybe chmod 0755 './apache2'
 maybe chmod 0644 './apache2/httpd.conf'
 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_www-servers_apache-2'
 maybe chmod 0644 './apache2/modules.d/00_apache_manual.conf'
 maybe chmod 0644 './apache2/modules.d/00_default_settings.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
index 0000000..c08b2a6
--- /dev/null
+++ b/apache2/modules.d/._cfg0000_00_apache_manual.conf
@@ -0,0 +1,26 @@
+# 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.2/
+<IfDefine MANUAL>
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.22-r1/manual$1"
+
+<Directory "/usr/share/doc/apache-2.2.22-r1/manual">
+	Options Indexes
+	AllowOverride None
+	Order allow,deny
+	Allow from all
+
+	<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>
+
+# vim: ts=4 filetype=apache