From b77c16086cc1341d0f5623adce1ef10515d929de Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Mon, 19 Sep 2016 18:10:45 -0700 Subject: [PATCH] Convert old download links to unified release urls (#20574) With the unified release process across the elastic stack, download links for all products are changing. This change updates docs referring to the old download and packages urls. Note that this change also updates the plugin installation command as the url for downloads is being changed to be consistent with that for packages (both plural). --- .../elasticsearch/plugins/InstallPluginCommand.java | 4 ++-- docs/reference/getting-started.asciidoc | 2 +- docs/reference/setup/install/deb.asciidoc | 12 ++++++------ docs/reference/setup/install/rpm.asciidoc | 10 +++++----- docs/reference/setup/install/windows.asciidoc | 2 +- docs/reference/setup/install/zip-targz.asciidoc | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java b/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java index 6579257b5a7..fba3fd529dc 100644 --- a/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java +++ b/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java @@ -212,11 +212,11 @@ class InstallPluginCommand extends SettingCommand { final String stagingHash = System.getProperty(PROPERTY_STAGING_ID); if (stagingHash != null) { url = String.format(Locale.ROOT, - "https://staging.elastic.co/%3$s-%1$s/download/elasticsearch-plugins/%2$s/%2$s-%3$s.zip", + "https://staging.elastic.co/%3$s-%1$s/downloads/elasticsearch-plugins/%2$s/%2$s-%3$s.zip", stagingHash, pluginId, version); } else { url = String.format(Locale.ROOT, - "https://artifacts.elastic.co/download/elasticsearch-plugins/%1$s/%1$s-%2$s.zip", + "https://artifacts.elastic.co/downloads/elasticsearch-plugins/%1$s/%1$s-%2$s.zip", pluginId, version); } terminal.println("-> Downloading " + pluginId + " from elastic"); diff --git a/docs/reference/getting-started.asciidoc b/docs/reference/getting-started.asciidoc index 760ea434bd6..e8ace29be22 100755 --- a/docs/reference/getting-started.asciidoc +++ b/docs/reference/getting-started.asciidoc @@ -116,7 +116,7 @@ Let's download the Elasticsearch {version} tar as follows (Windows users should ["source","sh",subs="attributes,callouts"] -------------------------------------------------- -curl -L -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/{version}/elasticsearch-{version}.tar.gz +curl -L -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.tar.gz -------------------------------------------------- Then extract it as follows (Windows users should unzip the zip package): diff --git a/docs/reference/setup/install/deb.asciidoc b/docs/reference/setup/install/deb.asciidoc index a9bf4170791..bba9fe80225 100644 --- a/docs/reference/setup/install/deb.asciidoc +++ b/docs/reference/setup/install/deb.asciidoc @@ -16,7 +16,7 @@ include::key.asciidoc[] [source,sh] ------------------------- -wget -qO - https://packages.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add - +wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add - ------------------------- [[deb-repo]] @@ -29,11 +29,11 @@ You may need to install the `apt-transport-https` package on Debian before proce sudo apt-get install apt-transport-https -------------------------------------------------- -Save the repository definition to +/etc/apt/sources.list.d/elasticsearch-{major-version}.list+: +Save the repository definition to +/etc/apt/sources.list.d/elastic-{major-version}.list+: ["source","sh",subs="attributes,callouts"] -------------------------------------------------- -echo "deb https://packages.elastic.co/elasticsearch/{major-version}/debian stable main" | sudo tee -a /etc/apt/sources.list.d/elasticsearch-{major-version}.list +echo "deb https://artifacts.elastic.co/packages/{major-version}.x/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-{major-version}.list -------------------------------------------------- [WARNING] @@ -63,7 +63,7 @@ If two entries exist for the same Elasticsearch repository, you will see an erro ["literal",subs="attributes,callouts"] -Duplicate sources.list entry https://packages.elastic.co/elasticsearch/{major-version}/debian/ ...` +Duplicate sources.list entry https://artifacts.elastic.co/packages/{major-version}.x/apt/ ...` Examine +/etc/apt/sources.list.d/elasticsearch-{major-version}.list+ for the duplicate entry or locate the duplicate entry amongst the files in `/etc/apt/sources.list.d/` and the `/etc/apt/sources.list` file. ================================================== @@ -76,12 +76,12 @@ The Debian package for Elastisearch v{version} can be downloaded from the websit ["source","sh",subs="attributes"] -------------------------------------------- -wget https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/{version}/elasticsearch-{version}.deb +wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.deb sha1sum elasticsearch-{version}.deb <1> sudo dpkg -i elasticsearch-{version}.deb -------------------------------------------- <1> Compare the SHA produced by `sha1sum` or `shasum` with the - https://download.elastics.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/{version}/elasticsearch-{version}.deb.sha1[published SHA]. + https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.deb.sha1[published SHA]. include::init-systemd.asciidoc[] diff --git a/docs/reference/setup/install/rpm.asciidoc b/docs/reference/setup/install/rpm.asciidoc index 08dfc253f0d..49d9c725f5a 100644 --- a/docs/reference/setup/install/rpm.asciidoc +++ b/docs/reference/setup/install/rpm.asciidoc @@ -20,7 +20,7 @@ include::key.asciidoc[] [source,sh] ------------------------- -rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch +rpm --import https://artifacts.elastic.co/GPG-KEY-elasticsearch ------------------------- [[rpm-repo]] @@ -34,9 +34,9 @@ OpenSuSE based distributions, containing: -------------------------------------------------- [elasticsearch-{major-version}] name=Elasticsearch repository for {major-version} packages -baseurl=https://packages.elastic.co/elasticsearch/{major-version}/centos +baseurl=https://artifacts.elastic.co/packages/{major-version}.x/yum gpgcheck=1 -gpgkey=https://packages.elastic.co/GPG-KEY-elasticsearch +gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch enabled=1 autorefresh=1 type=rpm-md @@ -61,12 +61,12 @@ The RPM for Elastisearch v{version} can be downloaded from the website and insta ["source","sh",subs="attributes"] -------------------------------------------- -wget https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/rpm/elasticsearch/{version}/elasticsearch-{version}.rpm +wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.rpm sha1sum elasticsearch-{version}.rpm <1> sudo rpm --install elasticsearch-{version}.rpm -------------------------------------------- <1> Compare the SHA produced by `sha1sum` or `shasum` with the - https://download.elastics.co/elasticsearch/release/org/elasticsearch/distribution/rpm/elasticsearch/{version}/elasticsearch-{version}.rpm.sha1[published SHA]. + https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.rpm.sha1[published SHA]. include::init-systemd.asciidoc[] diff --git a/docs/reference/setup/install/windows.asciidoc b/docs/reference/setup/install/windows.asciidoc index 5fbb147edf4..22e3c3b8d42 100644 --- a/docs/reference/setup/install/windows.asciidoc +++ b/docs/reference/setup/install/windows.asciidoc @@ -13,7 +13,7 @@ link:/downloads/past-releases[Past Releases page]. [[install-windows]] ==== Download and install the `.zip` package -Download the `.zip` archive for Elasticsearch v{version} from: https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/zip/elasticsearch/{version}/elasticsearch-{version}.zip +Download the `.zip` archive for Elasticsearch v{version} from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.zip Unzip it with your favourite unzip tool. This will create a folder called +elasticsearch-{version}+, which we will refer to as `%ES_HOME%`. In a terminal diff --git a/docs/reference/setup/install/zip-targz.asciidoc b/docs/reference/setup/install/zip-targz.asciidoc index 14421795e05..efbfc50f7a1 100644 --- a/docs/reference/setup/install/zip-targz.asciidoc +++ b/docs/reference/setup/install/zip-targz.asciidoc @@ -17,13 +17,13 @@ The `.zip` archive for Elastisearch v{version} can be downloaded and installed a ["source","sh",subs="attributes"] -------------------------------------------- -wget https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/zip/elasticsearch/{version}/elasticsearch-{version}.zip +wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.zip sha1sum elasticsearch-{version}.zip <1> unzip elasticsearch-{version}.zip cd elasticsearch-{version}/ <2> -------------------------------------------- <1> Compare the SHA produced by `sha1sum` or `shasum` with the - https://download.elastics.co/elasticsearch/release/org/elasticsearch/distribution/zip/elasticsearch/{version}/elasticsearch-{version}.zip.sha1[published SHA]. + https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.zip.sha1[published SHA]. <2> This directory is known as `$ES_HOME`. [[install-targz]] @@ -33,13 +33,13 @@ The `.tar.gz` archive for Elastisearch v{version} can be downloaded and installe ["source","sh",subs="attributes"] -------------------------------------------- -wget https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/{version}/elasticsearch-{version}.tar.gz +wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.tar.gz sha1sum elasticsearch-{version}.tar.gz <1> tar -xzf elasticsearch-{version}.tar.gz cd elasticsearch-{version}/ <2> -------------------------------------------- <1> Compare the SHA produced by `sha1sum` or `shasum` with the - https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/{version}/elasticsearch-{version}.tar.gz.sha1[published SHA]. + https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.tar.gz.sha1[published SHA]. <2> This directory is known as `$ES_HOME`. [[zip-targz-running]]