This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/solr-site.git


The following commit(s) were added to refs/heads/asf-staging by this push:
     new da0e6c1  Automatic Site Publish by Buildbot
da0e6c1 is described below

commit da0e6c1ade6004073363ff3dc7c35a42fb424d32
Author: buildbot <[email protected]>
AuthorDate: Sun Feb 6 00:22:01 2022 +0000

    Automatic Site Publish by Buildbot
---
 output/.htaccess       |  8 +++-----
 output/guide/.htaccess | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/output/.htaccess b/output/.htaccess
index c625f39..f3760f9 100644
--- a/output/.htaccess
+++ b/output/.htaccess
@@ -52,14 +52,12 @@ RedirectMatch Permanent ^/(\d+_\d+_\d+/.*)$ /docs/$1
 # Simple redirect to "directory", so later rules match
 RedirectMatch temp ^/api$ $0/
 RedirectMatch Permanent ^/docs/\d+_\d+_\d+$ $0/
-RedirectMatch Permanent ^/guide/\d+_\d+$ $0/
 
 # Other pages can always be redirected to the "most current" released javadocs
 # using "temp" instead of permanent so crawlers know that they
 # might change again in the future
 RedirectMatch temp ^/api/org/(.*) /docs/8_11_1/solr-core/org/$1
 RedirectMatch temp ^/api/(.*) /docs/8_11_1/$1
-RedirectMatch temp ^/guide/(?!index.html)([a-z].*) /guide/8_11/$1
 
 # Solr Tutorial is now in the Solr Ref Guide
 # should redirect automatically to latest version
@@ -73,10 +71,10 @@ RedirectMatch Permanent ^/docs/api-(.*) /docs/$1
 Redirect temp /charts https://nightlies.apache.org/solr/release/helm-charts
 Redirect temp /operator/downloads/crds 
https://nightlies.apache.org/solr/release/operator/crds
 
-### Javadocs & Refguide
+### Javadocs
 
 # Hack: Append slash, if folder name does not end with slash - everything 
containing a "." is treated as file and excluded from redirect:
-RewriteRule ^(docs|guide)/\d+(?!.+\.\w+$|.+/$).+$          $0/ [R=301,L]
+RewriteRule ^docs/\d+(?!.+\.\w+$|.+/$).+$          $0/ [R=301,L]
 
 # __root/docs.solr.apache.org/ is a special alias added by INFRA-19439, so we 
can refer to stuff in other places like SVN
-RewriteRule ^(docs|guide)/\d+.*$  __root/docs.solr.apache.org/$0 [PT]
\ No newline at end of file
+RewriteRule ^docs/\d+.*$  __root/docs.solr.apache.org/$0 [PT]
\ No newline at end of file
diff --git a/output/guide/.htaccess b/output/guide/.htaccess
new file mode 100644
index 0000000..5f47f56
--- /dev/null
+++ b/output/guide/.htaccess
@@ -0,0 +1,32 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+RewriteEngine on
+
+# Test of page rename redirects
+RewriteRule foo.html solr-glossary.html [R=301,NE,L]
+RewriteRule bar.html 8_0/solr-glossary.html [R=301,NE,L]
+
+# Simple redirect to "directory", so later rules match
+RedirectMatch Permanent ^\d+_\d+$ $0/
+
+# Redirect to latest guide version, e.g. /guide/foo.html is redirected to 
latest guide /guide/X_Y/foo.html
+RedirectMatch temp ^(?!index.html)([a-z].*) 8_11/$1
+
+# Hack: Append slash, if folder name does not end with slash - everything 
containing a "." is treated as file and excluded from redirect:
+RewriteRule ^\d+(?!.+\.\w+$|.+/$).+$          $0/ [R=301,L]
+
+# __root/docs.solr.apache.org/ is a special alias added by INFRA-19439, so we 
can refer to stuff in other places like SVN
+RewriteRule ^\d+.*$  __root/docs.solr.apache.org/$0 [PT]
\ No newline at end of file

Reply via email to