From 6cf5fdc3b1dbc6f5306b556c0d78313f93b92f95 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 20 Sep 2016 12:05:08 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 3 -- .../modules.d/._cfg0000_00_apache_manual.conf | 29 ------------------- .../modules.d/._mrg0000_00_apache_manual.conf | 29 ------------------- apache2/modules.d/00_apache_manual.conf | 4 +-- .../modules.d/00_apache_manual.conf.dist | 4 +-- .../modules.d/00_apache_manual.conf.dist.new | 29 ------------------- 6 files changed, 4 insertions(+), 94 deletions(-) delete mode 100644 apache2/modules.d/._cfg0000_00_apache_manual.conf delete mode 100644 apache2/modules.d/._mrg0000_00_apache_manual.conf delete mode 100644 config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist.new diff --git a/.etckeeper b/.etckeeper index 61b001c..562de06 100755 --- a/.etckeeper +++ b/.etckeeper @@ -66,8 +66,6 @@ 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/._mrg0000_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' @@ -267,7 +265,6 @@ maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_apache_manual.conf.7' maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_apache_manual.conf.8' maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_apache_manual.conf.9' maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist' -maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist.new' maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_default_settings.conf' maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_default_settings.conf.1' maybe chmod 0644 'config-archive/etc/apache2/modules.d/00_default_settings.conf.dist' diff --git a/apache2/modules.d/._cfg0000_00_apache_manual.conf b/apache2/modules.d/._cfg0000_00_apache_manual.conf deleted file mode 100644 index c1ddd15..0000000 --- a/apache2/modules.d/._cfg0000_00_apache_manual.conf +++ /dev/null @@ -1,29 +0,0 @@ -# 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/ - - - -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.23/manual$1" - - - Options Indexes - AllowOverride None - Require all granted - - - SetHandler type-map - - - 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 - - - - - -# vim: ts=4 filetype=apache diff --git a/apache2/modules.d/._mrg0000_00_apache_manual.conf b/apache2/modules.d/._mrg0000_00_apache_manual.conf deleted file mode 100644 index ec3abdd..0000000 --- a/apache2/modules.d/._mrg0000_00_apache_manual.conf +++ /dev/null @@ -1,29 +0,0 @@ -# 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/ - - - -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.23/manual$1" - - - Options Indexes - AllowOverride None - Require all granted - - - SetHandler type-map - - - 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 de en es fr ja ko pt-br - ForceLanguagePriority Prefer Fallback - - - - - -# vim: ts=4 filetype=apache diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf index 3faa571..ec3abdd 100644 --- a/apache2/modules.d/00_apache_manual.conf +++ b/apache2/modules.d/00_apache_manual.conf @@ -5,9 +5,9 @@ -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.20/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.23/manual$1" - + Options Indexes AllowOverride None Require all granted diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist index 7b89f91..c1ddd15 100644 --- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist +++ b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist @@ -5,9 +5,9 @@ -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.20/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.23/manual$1" - + Options Indexes AllowOverride None Require all granted diff --git a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist.new b/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist.new deleted file mode 100644 index c1ddd15..0000000 --- a/config-archive/etc/apache2/modules.d/00_apache_manual.conf.dist.new +++ /dev/null @@ -1,29 +0,0 @@ -# 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/ - - - -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.23/manual$1" - - - Options Indexes - AllowOverride None - Require all granted - - - SetHandler type-map - - - 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 - - - - - -# vim: ts=4 filetype=apache -- 2.39.5