This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-website.git
The following commit(s) were added to refs/heads/trunk by this push: new eaa6b3e7 Move deb/rpm repositories from dist/downloads .a.o to apache.jfrog.io eaa6b3e7 is described below commit eaa6b3e7ab510547346d5c5584977962e0b9549a Author: mck <m...@apache.org> AuthorDate: Thu Jul 14 08:27:24 2022 +0100 Move deb/rpm repositories from dist/downloads .a.o to apache.jfrog.io patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-17748 --- site-content/Dockerfile | 3 ++- site-content/docker-entrypoint.sh | 8 +++++--- site-content/source/modules/ROOT/pages/download.adoc | 9 +++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/site-content/Dockerfile b/site-content/Dockerfile index 2993c5be..4f8204ed 100644 --- a/site-content/Dockerfile +++ b/site-content/Dockerfile @@ -90,7 +90,8 @@ ENV ANTORA_SITE_START_PAGE="_" # Build from 3.11.5 as document generation for previous versions is broken. ENV ANTORA_CONTENT_SOURCES_CASSANDRA_URL="https://github.com/apache/cassandra.git" -ENV ANTORA_CONTENT_SOURCES_CASSANDRA_BRANCHES="trunk cassandra-4.0 cassandra-3.11" +ENV ANTORA_CONTENT_SOURCES_CASSANDRA_BRANCHES="trunk cassandra-4.1 cassandra-4.0 cassandra-3.11" +# FIXME – we can't generate tags yet as in-tree doc/antora.yml doesn't specify specifc tag versions ENV ANTORA_CONTENT_SOURCES_CASSANDRA_TAGS="" ENV ANTORA_CONTENT_SOURCES_CASSANDRA_START_PATH="doc" diff --git a/site-content/docker-entrypoint.sh b/site-content/docker-entrypoint.sh index 584fe0f0..6ef04e65 100755 --- a/site-content/docker-entrypoint.sh +++ b/site-content/docker-entrypoint.sh @@ -234,9 +234,11 @@ prepare_site_html_for_publication() { if [ "${COMMAND_GENERATE_DOCS}" = "run" ] then log_message "INFO" "Moving versioned documentation HTML to content/doc" - move_intree_document_directories "3.11" "3.11.11" "3.11.12" - move_intree_document_directories "4.0" "4.0.0" "4.0.1" "4.0.2" "4.0.3" "stable" - move_intree_document_directories "trunk" "4.1" "latest" + # FIXME – we can't generate tags yet as in-tree doc/antora.yml doesn't specify specifc tag versions, so just copy them for now (see same fixme in Dockerfile) + move_intree_document_directories "3.11" "3.11.11" "3.11.12" "3.11.13" + move_intree_document_directories "4.0" "4.0.0" "4.0.1" "4.0.2" "4.0.3" "4.0.4" "4.0.5" "stable" + move_intree_document_directories "4.1" "latest" + move_intree_document_directories "trunk" fi popd > /dev/null diff --git a/site-content/source/modules/ROOT/pages/download.adoc b/site-content/source/modules/ROOT/pages/download.adoc index 830654bd..e53649ab 100644 --- a/site-content/source/modules/ROOT/pages/download.adoc +++ b/site-content/source/modules/ROOT/pages/download.adoc @@ -86,6 +86,11 @@ Older (unsupported) versions of Cassandra are archived https://archive.apache.or [openblock,inner] ------ +[caution] +==== +image:/assets/img/caution.svg[alt="Caution"] Debian and RedHat package repositories have moved! Debian's `sources.list` and RedHat's `cassandra.repo` files must be updated to point to the new repository URLs (see below). +==== + [example] ==== @@ -99,7 +104,7 @@ Older (unsupported) versions of Cassandra are archived https://archive.apache.or [source] -- -echo "deb https://downloads.apache.org/cassandra/debian 40x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list +echo "deb https://debian.cassandra.apache.org 40x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list -- * Add the Apache Cassandra repository keys: @@ -168,7 +173,7 @@ and repeat `sudo apt-get update`. The actual key may be different, you get it fr -- [cassandra] name=Apache Cassandra -baseurl=https://downloads.apache.org/cassandra/redhat/40x/ +baseurl=https://redhat.cassandra.apache.org/40x/ gpgcheck=1 repo_gpgcheck=1 gpgkey=https://downloads.apache.org/cassandra/KEYS --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org