Skip to content

Commit

Permalink
Move deb/rpm repositories from dist/downloads .a.o to apache.jfrog.io
Browse files Browse the repository at this point in the history
 patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-17748
  • Loading branch information
michaelsembwever committed Aug 16, 2022
1 parent 930e594 commit eaa6b3e
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
3 changes: 2 additions & 1 deletion site-content/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
8 changes: 5 additions & 3 deletions site-content/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions site-content/source/modules/ROOT/pages/download.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]
====
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit eaa6b3e

Please sign in to comment.