Merge pull request #10090 from Icinga/rpi-os

Clarify that our Debian installation docs also apply to the Raspberry Pi OS
Icinga · Aug 26, 2024 · 585b357 · 585b357
2 parents a8adfed + d6bb971
commit 585b357
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 30 deletions.
diff --git 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
@@ -64,25 +64,6 @@ apt update
 ```
 <!-- {% endif %} -->
 
-<!-- {% if raspbian %} -->
-### Raspbian Repository <a id="raspbian-repository"></a>
-
-```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
-```
-<!-- {% endif %} -->
-
 <!-- {% if centos %} -->
 ### CentOS Repository <a id="centos-repository"></a>
 
@@ -229,9 +210,9 @@ with `root` permissions unless noted otherwise.
     If you have [SELinux](22-selinux.md) enabled, the package `icinga2-selinux` is also required.
 <!-- {% endif %} -->
 
-<!-- {% if debian or ubuntu or raspbian %} -->
+<!-- {% if debian or ubuntu %} -->
 <!-- {% if not icingaDocs %} -->
-#### Debian / Ubuntu / Raspbian
+#### Debian / Ubuntu / Raspberry Pi OS
 <!-- {% endif %} -->
 ```bash
 apt install icinga2
@@ -341,9 +322,9 @@ to determine where to find the plugin binaries.
     additional check plugins into your Icinga 2 setup.
 
 
-<!-- {% if debian or ubuntu or raspbian %} -->
+<!-- {% if debian or ubuntu %} -->
 <!-- {% if not icingaDocs %} -->
-#### Debian / Ubuntu / Raspbian
+#### Debian / Ubuntu / Raspberry Pi OS
 <!-- {% endif %} -->
 ```bash
 apt install monitoring-plugins
@@ -516,7 +497,7 @@ yum install icingadb-redis
 
 <!-- {% if debian or ubuntu %} -->
 <!-- {% if not icingaDocs %} -->
-##### Debian / Ubuntu
+##### Debian / Ubuntu / Raspberry Pi OS
 <!-- {% endif %} -->
 ```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
@@ -0,0 +1,3 @@
+# Install Icinga 2 on Raspberry Pi OS
+<!-- {% set debian = True %} -->
+<!-- {% include "02-installation.md" %} -->
diff --git a/doc/02-installation.md.d/03-Raspbian.md b/doc/02-installation.md.d/03-Raspbian.md
diff --git 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 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.