From 0109295b5a9c99725d7b897509d819dd80e73397 Mon Sep 17 00:00:00 2001 From: Houston Putman Date: Thu, 26 Aug 2021 16:11:40 -0400 Subject: [PATCH] Rename downloads page to artifacts. Simplifies htaccess --- content/doap/solr-operator.rdf | 2 +- .../pages/operator/articles/explore-v030-gke.md | 2 +- .../operator/{downloads.md => artifacts.md} | 8 ++++---- .../news/2021-04-29-v0-3-0-available.md | 2 +- pelicanconf.py | 2 +- themes/solr/templates/htaccess.template | 2 +- themes/solr/templates/operator/_footer.html | 2 +- themes/solr/templates/operator/_header.html | 2 +- .../operator/{downloads.html => artifacts.html} | 4 ++-- .../templates/operator/crds.htaccess.template | 17 ----------------- themes/solr/templates/operator/index.html | 2 +- 11 files changed, 14 insertions(+), 31 deletions(-) rename content/pages/operator/{downloads.md => artifacts.md} (84%) rename themes/solr/templates/operator/{downloads.html => artifacts.html} (98%) delete mode 100644 themes/solr/templates/operator/crds.htaccess.template diff --git a/content/doap/solr-operator.rdf b/content/doap/solr-operator.rdf index 112d499f0f..40a3760610 100644 --- a/content/doap/solr-operator.rdf +++ b/content/doap/solr-operator.rdf @@ -30,7 +30,7 @@ Manages Solr resources in Kubernetes - + Go diff --git a/content/pages/operator/articles/explore-v030-gke.md b/content/pages/operator/articles/explore-v030-gke.md index 8fe36c0c3c..43ad3a8d99 100644 --- a/content/pages/operator/articles/explore-v030-gke.md +++ b/content/pages/operator/articles/explore-v030-gke.md @@ -8,7 +8,7 @@ template: operator/page _Author: Tim Potter_ Earlier this year, Bloomberg graciously donated the Solr operator to the Apache Software Foundation. -The latest [v0.3.0 release]({filename}/pages/operator/downloads.md#solr-v030) is the first under Apache and represents a significant milestone for the Apache Solr community at large. +The latest [v0.3.0 release]({filename}/pages/operator/artifacts.md) is the first under Apache and represents a significant milestone for the Apache Solr community at large. The operator is Solr’s first satellite project that is managed by the Solr PMC but released independently of Apache Solr. The community now has a powerful vehicle to translate hard-earned lessons and best practices running Solr at scale into automated solutions on Kubernetes. diff --git a/content/pages/operator/downloads.md b/content/pages/operator/artifacts.md similarity index 84% rename from content/pages/operator/downloads.md rename to content/pages/operator/artifacts.md index 6f04f16095..af631a29af 100644 --- a/content/pages/operator/downloads.md +++ b/content/pages/operator/artifacts.md @@ -1,7 +1,7 @@ -Title: Downloads -URL: operator/downloads.html -save_as: operator/downloads.html -template: operator/downloads +Title: Artifacts +URL: operator/artifacts.html +save_as: operator/artifacts.html +template: operator/artifacts Official releases are usually created when the [developers]({filename}/pages/whoweare.md) feel there are sufficient changes, improvements and bug fixes to warrant a release. diff --git a/content/solr/operator/news/2021-04-29-v0-3-0-available.md b/content/solr/operator/news/2021-04-29-v0-3-0-available.md index c1ce30038b..b7799a7533 100644 --- a/content/solr/operator/news/2021-04-29-v0-3-0-available.md +++ b/content/solr/operator/news/2021-04-29-v0-3-0-available.md @@ -8,7 +8,7 @@ The Apache Solr Operator is a safe and easy way of managing a Solr ecosystem in This release contains numerous bug fixes, optimizations, and improvements, some of which are highlighted below. The release is available for immediate download at: - + ### Solr Operator v0.3.0 Release Highlights: diff --git a/pelicanconf.py b/pelicanconf.py index ef063097d9..970d3ddaba 100755 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -89,7 +89,7 @@ STATIC_PATHS = ['.'] -TEMPLATE_PAGES = {'htaccess.template': '.htaccess', 'operator/crds.htaccess.template': 'operator/downloads/crds/.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 b5286fb146..463ec0c6a3 100644 --- a/themes/solr/templates/htaccess.template +++ b/themes/solr/templates/htaccess.template @@ -71,7 +71,7 @@ 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 -RewriteRule ^operator/downloads/?$ operator/downloads.html [PT] +Redirect temp /operator/downloads/crds https://nightlies.apache.org/solr/release/operator/crds ### Javadocs & Refguide diff --git a/themes/solr/templates/operator/_footer.html b/themes/solr/templates/operator/_footer.html index e81f6eb56e..19ef046e83 100644 --- a/themes/solr/templates/operator/_footer.html +++ b/themes/solr/templates/operator/_footer.html @@ -28,7 +28,7 @@

Resources

Get Started

diff --git a/themes/solr/templates/operator/_header.html b/themes/solr/templates/operator/_header.html index 4a5433971c..f1c6a316ce 100644 --- a/themes/solr/templates/operator/_header.html +++ b/themes/solr/templates/operator/_header.html @@ -31,7 +31,7 @@ -->
  • - Download + Artifacts
  • ᐱ Solr TLP diff --git a/themes/solr/templates/operator/downloads.html b/themes/solr/templates/operator/artifacts.html similarity index 98% rename from themes/solr/templates/operator/downloads.html rename to themes/solr/templates/operator/artifacts.html index 47378dbe92..865d7b8ab0 100644 --- a/themes/solr/templates/operator/downloads.html +++ b/themes/solr/templates/operator/artifacts.html @@ -11,8 +11,8 @@ } -

    {{ page.title }} - +

    {{ page.title }} +

    {{ page.content }}

    Solr Operator {{ SOLR_OPERATOR_LATEST_RELEASE }} diff --git a/themes/solr/templates/operator/crds.htaccess.template b/themes/solr/templates/operator/crds.htaccess.template deleted file mode 100644 index 02998657a2..0000000000 --- a/themes/solr/templates/operator/crds.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 diff --git a/themes/solr/templates/operator/index.html b/themes/solr/templates/operator/index.html index 6211933012..73d3cb6483 100644 --- a/themes/solr/templates/operator/index.html +++ b/themes/solr/templates/operator/index.html @@ -291,7 +291,7 @@

    Apache Solr Operator {{ SOLR_OPERATOR_LATEST_RELEASE }} available

    - The Solr PMC is pleased to announce the release of Apache Solr Operator {{ SOLR_OPERATOR_LATEST_RELEASE }}. Download here. + The Solr PMC is pleased to announce the release of Apache Solr Operator {{ SOLR_OPERATOR_LATEST_RELEASE }}. Artifacts can be found here.

    Read More News