From d1aa2632258c55b80b44dcf0ef5dfd9e5df4cf42 Mon Sep 17 00:00:00 2001 From: KOTungseth Date: Thu, 19 May 2022 10:03:57 -0500 Subject: [PATCH 1/3] [DOCS] Removes apt-key from Debian install page --- docs/setup/install/deb.asciidoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/setup/install/deb.asciidoc b/docs/setup/install/deb.asciidoc index 8e8c43ff8a15d..d0baafd06adbf 100644 --- a/docs/setup/install/deb.asciidoc +++ b/docs/setup/install/deb.asciidoc @@ -22,7 +22,7 @@ include::key.asciidoc[] [source,sh] ------------------------- -wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add - +wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /usr/share/keyrings/elasticsearch-keyring.gpg && sudo chmod 0644 /usr/share/keyrings/elasticsearch-keyring.gpg ------------------------- [[deb-repo]] @@ -49,7 +49,7 @@ ifeval::["{release-state}"=="released"] ["source","sh",subs="attributes,callouts"] -------------------------------------------------- -echo "deb https://artifacts.elastic.co/packages/{major-version}/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-{major-version}.list +echo "deb [signed-by=/usr/share/keyrings/elasticsearch-keyring.gpg] https://artifacts.elastic.co/packages/{major-version}/apt stable main" | sudo tee /etc/apt/sources.list.d/elastic-{major-version}.list -------------------------------------------------- endif::[] @@ -58,7 +58,7 @@ ifeval::["{release-state}"=="prerelease"] ["source","sh",subs="attributes,callouts"] -------------------------------------------------- -echo "deb https://artifacts.elastic.co/packages/{major-version}-prerelease/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-{major-version}.list +echo "deb [signed-by=/usr/share/keyrings/elasticsearch-keyring.gpg] https://artifacts.elastic.co/packages/{major-version}-prerelease/apt stable main" | sudo tee /etc/apt/sources.list.d/elastic-{major-version}.list -------------------------------------------------- endif::[] From cfbb3f73495b76a16cae52a43cd201bf630b81ca Mon Sep 17 00:00:00 2001 From: KOTungseth Date: Fri, 20 May 2022 12:01:15 -0500 Subject: [PATCH 2/3] Removes chmod --- docs/setup/install/deb.asciidoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/setup/install/deb.asciidoc b/docs/setup/install/deb.asciidoc index d0baafd06adbf..2d86e84e45437 100644 --- a/docs/setup/install/deb.asciidoc +++ b/docs/setup/install/deb.asciidoc @@ -22,8 +22,7 @@ include::key.asciidoc[] [source,sh] ------------------------- -wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /usr/share/keyrings/elasticsearch-keyring.gpg && sudo chmod 0644 /usr/share/keyrings/elasticsearch-keyring.gpg -------------------------- +wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /usr/share/keyrings/elasticsearch-keyring.gpg [[deb-repo]] ==== Install from the APT repository From fdf4d6efc1e2f43ae3596976f4540a0ce1841e0c Mon Sep 17 00:00:00 2001 From: KOTungseth Date: Thu, 26 May 2022 10:15:05 -0500 Subject: [PATCH 3/3] Fixes broken code block --- docs/setup/install/deb.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/setup/install/deb.asciidoc b/docs/setup/install/deb.asciidoc index 2d86e84e45437..69367c0e91959 100644 --- a/docs/setup/install/deb.asciidoc +++ b/docs/setup/install/deb.asciidoc @@ -23,6 +23,7 @@ include::key.asciidoc[] [source,sh] ------------------------- wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /usr/share/keyrings/elasticsearch-keyring.gpg +------------------------- [[deb-repo]] ==== Install from the APT repository