diff --git a/Debian.md b/Debian.md index b90ce0d..4ee05df 100644 --- a/Debian.md +++ b/Debian.md @@ -15,16 +15,18 @@ Here’s how to add the official release repository: ```bash apt update -apt -y install apt-transport-https wget gnupg +apt -y install apt-transport-https wget -install -d -o root -g root -m 0755 /etc/apt/keyrings +wget -O icinga-archive-keyring.deb "https://packages.icinga.com/icinga-archive-keyring_latest+debian$( + . /etc/os-release; echo "$VERSION_ID" +).deb" -wget -O - https://packages.icinga.com/icinga.key | gpg --dearmor -o /etc/apt/keyrings/icinga.gpg +apt install ./icinga-archive-keyring.deb DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release); \ - echo "deb [signed-by=/etc/apt/keyrings/icinga.gpg] https://packages.icinga.com/debian icinga-${DIST} main" > \ + echo "deb [signed-by=/usr/share/keyrings/icinga-archive-keyring.gpg] https://packages.icinga.com/debian icinga-${DIST} main" > \ /etc/apt/sources.list.d/${DIST}-icinga.list - echo "deb-src [signed-by=/etc/apt/keyrings/icinga.gpg] https://packages.icinga.com/debian icinga-${DIST} main" >> \ + echo "deb-src [signed-by=/usr/share/keyrings/icinga-archive-keyring.gpg] https://packages.icinga.com/debian icinga-${DIST} main" >> \ /etc/apt/sources.list.d/${DIST}-icinga.list apt update diff --git a/Ubuntu.md b/Ubuntu.md index 384ff18..fdde3da 100644 --- a/Ubuntu.md +++ b/Ubuntu.md @@ -13,16 +13,18 @@ Here’s how to add the official release repository: ```bash apt update -apt -y install apt-transport-https wget gnupg +apt -y install apt-transport-https wget -install -d -o root -g root -m 0755 /etc/apt/keyrings +wget -O icinga-archive-keyring.deb "https://packages.icinga.com/icinga-archive-keyring_latest+ubuntu$( + . /etc/os-release; echo "$VERSION_ID" +).deb" -wget -O - https://packages.icinga.com/icinga.key | gpg --dearmor -o /etc/apt/keyrings/icinga.gpg +apt install ./icinga-archive-keyring.deb . /etc/os-release; if [ ! -z ${UBUNTU_CODENAME+x} ]; then DIST="${UBUNTU_CODENAME}"; else DIST="$(lsb_release -c| awk '{print $2}')"; fi; \ - echo "deb [signed-by=/etc/apt/keyrings/icinga.gpg] https://packages.icinga.com/ubuntu icinga-${DIST} main" > \ + echo "deb [signed-by=/usr/share/keyrings/icinga-archive-keyring.gpg] https://packages.icinga.com/ubuntu icinga-${DIST} main" > \ /etc/apt/sources.list.d/${DIST}-icinga.list - echo "deb-src [signed-by=/etc/apt/keyrings/icinga.gpg] https://packages.icinga.com/ubuntu icinga-${DIST} main" >> \ + echo "deb-src [signed-by=/usr/share/keyrings/icinga-archive-keyring.gpg] https://packages.icinga.com/ubuntu icinga-${DIST} main" >> \ /etc/apt/sources.list.d/${DIST}-icinga.list apt update