From c6bf1c7f261aa23709fa00590abea821ff24daa7 Mon Sep 17 00:00:00 2001 From: Andrei Shevchuk Date: Wed, 27 Sep 2023 13:12:21 +0000 Subject: [PATCH] install.sh: Sync Debian keys and repo source file location with docs (#1172) Remove the possible file locations where the GPG key could be added --- release_files/install.sh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/release_files/install.sh b/release_files/install.sh index 55d16131d..2ba0495fd 100755 --- a/release_files/install.sh +++ b/release_files/install.sh @@ -73,13 +73,21 @@ download_release_binary() { add_apt_repo() { sudo apt-get update - sudo apt-get install ca-certificates gnupg -y + sudo apt-get install ca-certificates curl gnupg -y - curl -sSL https://pkgs.wiretrustee.com/debian/public.key \ - | sudo gpg --dearmor --output /usr/share/keyrings/wiretrustee-archive-keyring.gpg + # Remove old keys and repo source files + sudo rm -f \ + /etc/apt/sources.list.d/netbird.list \ + /etc/apt/sources.list.d/wiretrustee.list \ + /etc/apt/trusted.gpg.d/wiretrustee.gpg \ + /usr/share/keyrings/netbird-archive-keyring.gpg \ + /usr/share/keyrings/wiretrustee-archive-keyring.gpg - APT_REPO="deb [signed-by=/usr/share/keyrings/wiretrustee-archive-keyring.gpg] https://pkgs.wiretrustee.com/debian stable main" - echo "$APT_REPO" | sudo tee /etc/apt/sources.list.d/wiretrustee.list + curl -sSL https://pkgs.netbird.io/debian/public.key \ + | sudo gpg --dearmor -o /usr/share/keyrings/netbird-archive-keyring.gpg + + echo 'deb [signed-by=/usr/share/keyrings/netbird-archive-keyring.gpg] https://pkgs.netbird.io/debian stable main' \ + | sudo tee /etc/apt/sources.list.d/netbird.list sudo apt-get update } @@ -369,4 +377,4 @@ case "$1" in ;; *) install_netbird -esac \ No newline at end of file +esac