summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--httpd.spec5
-rw-r--r--manual.conf4
2 files changed, 7 insertions, 2 deletions
diff --git a/httpd.spec b/httpd.spec
index e6307d0..c77c6c3 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -8,7 +8,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.18
-Release: 4%{?dist}
+Release: 5%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -672,6 +672,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
+* Wed Apr 6 2016 Joe Orton <jorton@redhat.com> - 2.4.18-5
+- use redirects for lang-specific /manual/ URLs
+
* Fri Mar 18 2016 Joe Orton <jorton@redhat.com> - 2.4.18-4
- fix welcome page HTML validity (Ville Skyttä)
diff --git a/manual.conf b/manual.conf
index d09757d..3aa2049 100644
--- a/manual.conf
+++ b/manual.conf
@@ -2,10 +2,12 @@
# This configuration file allows the manual to be accessed at
# http://localhost/manual/
#
-AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "/usr/share/httpd/manual$1"
+Alias /manual /usr/share/httpd/manual
<Directory "/usr/share/httpd/manual">
Options Indexes
AllowOverride None
Require all granted
+
+ RedirectMatch 301 ^/manual/(?:da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn)(/.*)$ "/manual$1
</Directory>