From 14e269060ae78dd44677605d4d2d94c09543e6ea Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 20 Jun 2024 17:12:21 +0200 Subject: [PATCH 1/2] Clarify that our Debian installation docs also apply to the Raspberry Pi OS --- .github/workflows/linux.yml | 4 ++-- doc/02-installation.md | 6 +++--- doc/02-installation.md.d/03-Raspberry-Pi-OS.md | 3 +++ doc/13-addons.md | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 doc/02-installation.md.d/03-Raspberry-Pi-OS.md diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e47033898..19f87097d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -23,8 +23,8 @@ jobs: distro: - amazonlinux:2 - amazonlinux:2023 - - debian:11 # and Raspbian 11 - - debian:12 # and Raspbian 12 + - debian:11 # and Raspberry Pi OS 11 + - debian:12 # and Raspberry Pi OS 12 - fedora:37 - fedora:38 - fedora:39 diff --git a/doc/02-installation.md b/doc/02-installation.md index 79741769d..f9b9087e5 100644 --- a/doc/02-installation.md +++ b/doc/02-installation.md @@ -246,7 +246,7 @@ with `root` permissions unless noted otherwise. -#### Debian / Ubuntu / Raspbian +#### Debian / Ubuntu / Raspbian / Raspberry Pi OS ```bash apt install icinga2 @@ -358,7 +358,7 @@ to determine where to find the plugin binaries. -#### Debian / Ubuntu / Raspbian +#### Debian / Ubuntu / Raspbian / Raspberry Pi OS ```bash apt install monitoring-plugins @@ -531,7 +531,7 @@ yum install icingadb-redis -##### Debian / Ubuntu +##### Debian / Ubuntu / Raspberry Pi OS ```bash apt install icingadb-redis diff --git a/doc/02-installation.md.d/03-Raspberry-Pi-OS.md b/doc/02-installation.md.d/03-Raspberry-Pi-OS.md new file mode 100644 index 000000000..a69b453ee --- /dev/null +++ b/doc/02-installation.md.d/03-Raspberry-Pi-OS.md @@ -0,0 +1,3 @@ +# Install Icinga 2 on Raspberry Pi OS + + diff --git a/doc/13-addons.md b/doc/13-addons.md index 953b7f0bb..c3823f53d 100644 --- a/doc/13-addons.md +++ b/doc/13-addons.md @@ -32,7 +32,7 @@ vim /etc/icinga2/conf.d/templates.conf Install the package `nano-icinga2` with your distribution's package manager. -**Note:** On Debian, Ubuntu and Raspbian, the syntax files are installed with the `icinga2-common` package already. +**Note:** On Debian, Ubuntu, Raspbian and Raspberry Pi OS, the syntax files are installed with the `icinga2-common` package already. Copy the `/etc/nanorc` sample file to your home directory. From d6bb971c7f8054a3ac1d394dbe96fc02d798b150 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Wed, 21 Aug 2024 11:24:14 +0200 Subject: [PATCH 2/2] doc/02-installation.md: remove Raspbian which is not supported anymore --- doc/02-installation.md | 27 ++++--------------------- doc/02-installation.md.d/03-Raspbian.md | 3 --- doc/13-addons.md | 2 +- 3 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 doc/02-installation.md.d/03-Raspbian.md diff --git a/doc/02-installation.md b/doc/02-installation.md index f9b9087e5..9abd4b66e 100644 --- a/doc/02-installation.md +++ b/doc/02-installation.md @@ -79,25 +79,6 @@ apt update ``` - -### Raspbian Repository - -```bash -apt update -apt -y install apt-transport-https wget gnupg - -wget -O - https://packages.icinga.com/icinga.key | gpg --dearmor -o /usr/share/keyrings/icinga-archive-keyring.gpg - -DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release); \ - echo "deb [signed-by=/usr/share/keyrings/icinga-archive-keyring.gpg] https://packages.icinga.com/raspbian icinga-${DIST} main" > \ - /etc/apt/sources.list.d/icinga.list - echo "deb-src [signed-by=/usr/share/keyrings/icinga-archive-keyring.gpg] https://packages.icinga.com/raspbian icinga-${DIST} main" >> \ - /etc/apt/sources.list.d/icinga.list - -apt update -``` - - ### CentOS Repository @@ -244,9 +225,9 @@ with `root` permissions unless noted otherwise. If you have [SELinux](22-selinux.md) enabled, the package `icinga2-selinux` is also required. - + -#### Debian / Ubuntu / Raspbian / Raspberry Pi OS +#### Debian / Ubuntu / Raspberry Pi OS ```bash apt install icinga2 @@ -356,9 +337,9 @@ to determine where to find the plugin binaries. additional check plugins into your Icinga 2 setup. - + -#### Debian / Ubuntu / Raspbian / Raspberry Pi OS +#### Debian / Ubuntu / Raspberry Pi OS ```bash apt install monitoring-plugins diff --git a/doc/02-installation.md.d/03-Raspbian.md b/doc/02-installation.md.d/03-Raspbian.md deleted file mode 100644 index fc48d6c67..000000000 --- a/doc/02-installation.md.d/03-Raspbian.md +++ /dev/null @@ -1,3 +0,0 @@ -# Install Icinga 2 on Raspbian - - diff --git a/doc/13-addons.md b/doc/13-addons.md index c3823f53d..f92982a94 100644 --- a/doc/13-addons.md +++ b/doc/13-addons.md @@ -32,7 +32,7 @@ vim /etc/icinga2/conf.d/templates.conf Install the package `nano-icinga2` with your distribution's package manager. -**Note:** On Debian, Ubuntu, Raspbian and Raspberry Pi OS, the syntax files are installed with the `icinga2-common` package already. +**Note:** On Debian, Ubuntu and Raspberry Pi OS, the syntax files are installed with the `icinga2-common` package already. Copy the `/etc/nanorc` sample file to your home directory.