[solr-site] branch main updated: Another attempt for the CRDs htaccess

[ho...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 3b6ebc2  Another attempt for the CRDs htaccess
3b6ebc2 is described below

commit 3b6ebc222f7ca400ff083afc07daa6717b75c5fb
Author: Houston Putman <ho...@apache.org>
AuthorDate: Fri Apr 30 17:17:02 2021 -0500

    Another attempt for the CRDs htaccess
---
 pelicanconf.py                                   |  2 +-
 themes/solr/templates/htaccess.template          |  4 ++--
 themes/solr/templates/operator/htaccess.template | 17 -----------------
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/pelicanconf.py b/pelicanconf.py
index 37224b4..0953bfc 100755
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -89,7 +89,7 @@ EXTRA_PATH_METADATA = {}
 
 STATIC_PATHS = ['.']
 
-TEMPLATE_PAGES = {'htaccess.template': '.htaccess', 'operator/htaccess.template': 'operator/.htaccess'}
+TEMPLATE_PAGES = {'htaccess.template': '.htaccess'}
 
 PLUGIN_PATHS = ['./plugins']
 PLUGINS = [
diff --git a/themes/solr/templates/htaccess.template b/themes/solr/templates/htaccess.template
index 40c268c..54373cd 100644
--- a/themes/solr/templates/htaccess.template
+++ b/themes/solr/templates/htaccess.template
@@ -70,8 +70,8 @@ RedirectMatch Permanent ^/docs/4_0_0-(ALPHA|BETA)(.*) /docs/4_0_0$2
 RedirectMatch Permanent ^/docs/api-(.*) /docs/$1
 
 ### Redirects to Apache Nightlies, this will change when they have a separate area for released artifacts
-Redirect temp "/charts" "https://nightlies.apache.org/solr/release/helm-charts"
-Redirect temp "/operator/downloads/crds" "https://nightlies.apache.org/solr/release/operator/crds"
+Redirect temp /charts https://nightlies.apache.org/solr/release/helm-charts
+RedirectMatch temp ^/operator/downloads/crds(/.*)$ https://nightlies.apache.org/solr/release/operator/crds$1
 
 ### Javadocs & Refguide
 
diff --git a/themes/solr/templates/operator/htaccess.template b/themes/solr/templates/operator/htaccess.template
deleted file mode 100644
index 24f11fa..0000000
--- a/themes/solr/templates/operator/htaccess.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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.
-
-### Redirects to Apache Nightlies, this will change when they have a separate area for released artifacts
-Redirect temp "/operator/downloads/crds" "https://nightlies.apache.org/solr/release/operator/crds"