Skip to content

Commit 2b65880

Browse files
author
Sebastian Wagner
committed
DOC: update installation instructions
add centos8 drop ubuntu 19.10 wording changes to make it clearer drop unnessary APT key instructions, already part of the SOO page
1 parent cd03767 commit 2b65880

File tree

1 file changed

+30
-20
lines changed

1 file changed

+30
-20
lines changed

docs/user/installation.rst

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The following instructions assume the following requirements. Python versions >=
1616

1717
Supported and recommended operating systems are:
1818

19-
* CentOS 7
19+
* CentOS 7 and 8
2020
* Debian 9 and 10
2121
* OpenSUSE Leap 15.1, 15.2
2222
* Ubuntu: 16.04, 18.04, 20.04
@@ -26,7 +26,7 @@ Other distributions which are (most probably) supported include CentOS 8, RHEL,
2626
Install Dependencies
2727
--------------------
2828

29-
If you are using native packages, you can simply skip this section as all dependencies are installed automatically.
29+
**If you are using native packages, you skip this section as all dependencies are installed automatically.**
3030

3131
Ubuntu / Debian
3232
^^^^^^^^^^^^^^^
@@ -53,8 +53,23 @@ CentOS 7 / RHEL 7
5353
yum install gcc gcc-c++
5454
yum install redis
5555
56-
openSUSE 15.1
57-
^^^^^^^^^^^^^
56+
CentOS 8
57+
^^^^^^^^
58+
59+
.. code-block:: bash
60+
61+
dnf install epel-release
62+
dnf install python3-dateutil python3-dns python3-pip python3-psutil python3-pytz python3-redis python3-requests redis
63+
64+
Optional dependencies:
65+
66+
.. code-block:: bash
67+
68+
dnf install bash-completion jq
69+
dnf install python3-psycopg2 python3-pymongo
70+
71+
openSUSE 15.1 / 15.2
72+
^^^^^^^^^^^^^^^^^^^^
5873

5974
.. code-block:: bash
6075
@@ -81,29 +96,24 @@ Installation methods available:
8196
Native Packages
8297
^^^^^^^^^^^^^^^
8398

84-
Supported Operating Systems:
99+
These are the operating systems which are currently supported by packages:
85100

86-
* **CentOS 7** (requires `epel-release`)
87-
* **Debian 8** (requires `python3-typing`)
101+
* **CentOS 7** (run `yum install epel-release` first)
102+
* **CentOS 8** (run `dnf install epel-release` first)
88103
* **Debian 9**
89104
* **Debian 10**
90-
* **Fedora 29**
91105
* **Fedora 30**
92-
* **RHEL 7** (requires `epel-release`)
93-
* **openSUSE Leap 15.0**
106+
* **Fedora 31**
107+
* **Fedora 32**
94108
* **openSUSE Leap 15.1**
109+
* **openSUSE Leap 15.2**
95110
* **openSUSE Tumbleweed**
96-
* **Ubuntu 16.04** (enable the universe repositories by appending ` universe` in `/etc/apt/sources.list` to `deb http://[...].archive.ubuntu.com/ubuntu/ xenial main`)
97-
* **Ubuntu 18.04** (enable the universe repositories by appending ` universe` in `/etc/apt/sources.list` to `deb http://[...].archive.ubuntu.com/ubuntu/ bionic main`)
98-
* **Ubuntu 19.10** (enable the universe repositories by appending ` universe` in `/etc/apt/sources.list` to `deb http://[...].archive.ubuntu.com/ubuntu/ eoan main`)
99-
* **Ubuntu 20.04** (enable the universe repositories by appending ` universe` in `/etc/apt/sources.list` to `deb http://[...].archive.ubuntu.com/ubuntu/ focal main`)
100-
101-
Get the installation instructions for your operating system here: `Installation Native Packages <https://software.opensuse.org/download.html?project=home%3Asebix%3Aintelmq&package=intelmq>`_.
102-
To import the key on Debian and Ubuntu, use:
103-
104-
.. code-block:: bash
111+
* **Ubuntu 16.04** (enable the universe repositories by appending `universe` in `/etc/apt/sources.list` to `deb http://[...].archive.ubuntu.com/ubuntu/ xenial main` first)
112+
* **Ubuntu 18.04** (enable the universe repositories by appending `universe` in `/etc/apt/sources.list` to `deb http://[...].archive.ubuntu.com/ubuntu/ bionic main` first)
113+
* **Ubuntu 20.04** (enable the universe repositories by appending `universe` in `/etc/apt/sources.list` to `deb http://[...].archive.ubuntu.com/ubuntu/ focal main` first)
105114

106-
curl https://build.opensuse.org/projects/home:sebix:intelmq/public_key | sudo apt-key add -
115+
Get the installation instructions for your operating system here: `Installation Native Packages <https://software.opensuse.org/download.html?project=home:sebix:intelmq&package=intelmq>`_.
116+
The instructions show how to add the repository and install the `intelmq` package. You can also install the `intelmq-manager` package to get the [Web-Frontend IntelMQ Manager](https://github.com/certtools/intelmq-manager/).
107117

108118
Please report any errors or improvements at `IntelMQ Issues <https://github.com/certtools/intelmq/issues>`_. Thanks!
109119

0 commit comments

Comments
 (0)