From 8bfb3e5bd6c6c28066b449f480a0d9180047656d Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 13 Aug 2024 20:57:50 +0200 Subject: [PATCH 1/3] docs: installation: name apt source file .list fixes https://github.com/certtools/intelmq/issues/2496 --- docs/admin/installation/linux-packages.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/admin/installation/linux-packages.md b/docs/admin/installation/linux-packages.md index 23d97c3d5..d32a594c2 100644 --- a/docs/admin/installation/linux-packages.md +++ b/docs/admin/installation/linux-packages.md @@ -1,5 +1,5 @@ @@ -27,7 +27,7 @@ Native packages are currently provided for the following Linux distributions: Add the repository to the package manager and install IntelMQ (packages `intelmq-api` and `intelmq-manager` are optional): ```bash -echo "deb http://download.opensuse.org/repositories/home:/sebix:/intelmq/Debian_$(lsb_release -rs)/ /" | sudo tee /etc/apt/sources.list.d/intelmq +echo "deb http://download.opensuse.org/repositories/home:/sebix:/intelmq/Debian_$(lsb_release -rs)/ /" | sudo tee /etc/apt/sources.list.d/intelmq.list curl -fsSL "https://download.opensuse.org/repositories/home:sebix:intelmq/Debian_$(lsb_release -rs)/Release.key" | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/intelmq.gpg > /dev/null sudo apt update sudo apt install intelmq intelmq-api intelmq-manager @@ -50,7 +50,7 @@ For Ubuntu you must enable the Universe repository which provides community-main Add the repository to the package manager and install IntelMQ (packages `intelmq-api` and `intelmq-manager` are optional): 1. Open the file `/etc/apt/sources.list` in an editor of your choice. Use `sudo` or the `root` user. - + 2. Append `universe` to this line: ``` deb http://[...].archive.ubuntu.com/ubuntu/ focal main universe From 3df21e205d7d1b24ca7197b2034f0771f7905f8f Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 13 Aug 2024 21:05:59 +0200 Subject: [PATCH 2/3] docs: remove leap 15.5 from installation docs --- docs/admin/installation/linux-packages.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/admin/installation/linux-packages.md b/docs/admin/installation/linux-packages.md index d32a594c2..8e6027673 100644 --- a/docs/admin/installation/linux-packages.md +++ b/docs/admin/installation/linux-packages.md @@ -18,7 +18,6 @@ Native packages are currently provided for the following Linux distributions: - **Debian 11** (bullseye) - **Debian 12** (bookworm) - **openSUSE Tumbleweed** -- **openSUSE Leap 15.5** - **Ubuntu 20.04** (focal fossa) - **Ubuntu 22.04** (jammy jellyfish) From 95e50b3aa9ba53ee2a02f1b5031acbe9f791ddf0 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 13 Aug 2024 21:06:15 +0200 Subject: [PATCH 3/3] docs: add missing apt configuration to ubuntu installation fixes https://github.com/certtools/intelmq/issues/2517 --- docs/admin/installation/linux-packages.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/admin/installation/linux-packages.md b/docs/admin/installation/linux-packages.md index 8e6027673..eccc4ab15 100644 --- a/docs/admin/installation/linux-packages.md +++ b/docs/admin/installation/linux-packages.md @@ -55,7 +55,13 @@ Add the repository to the package manager and install IntelMQ (packages `intelmq deb http://[...].archive.ubuntu.com/ubuntu/ focal main universe ``` -3. Update the list of available packages and install IntelMQ: +3. Next, add the IntelMQ APT Repository for Ubuntu: +```bash +echo "deb http://download.opensuse.org/repositories/home:/sebix:/intelmq/xUbuntu_$(lsb_release -rs)/ /" | sudo tee /etc/apt/sources.list.d/intelmq.list +curl -fsSL "https://download.opensuse.org/repositories/home:sebix:intelmq/xUbuntu_$(lsb_release -rs)/Release.key" | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/intelmq.gpg > /dev/null +``` + +3. Now update the list of available packages and install the IntelMQ packages: ```bash sudo apt update sudo apt install intelmq intelmq-api intelmq-manager