diff --git a/docs/INSTALL.ubuntu2004.md b/docs/INSTALL.ubuntu2004.md index 12fbca5c6..1b2801ebf 100644 --- a/docs/INSTALL.ubuntu2004.md +++ b/docs/INSTALL.ubuntu2004.md @@ -5,7 +5,7 @@ Make sure you are reading the parsed version of this Document. When in doubt [click here](https://misp.github.io/MISP/INSTALL.ubuntu1804/). -To install MISP on a fresh Ubuntu 18.04, all you need to do is the following: +To install MISP on a fresh Ubuntu 20.04, all you need to do is the following: ```bash # Please check the installer options first to make the best choice for your install @@ -17,10 +17,10 @@ wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/ bash /tmp/INSTALL.sh -c ``` -### 0/ MISP Ubuntu 18.04-server install - status +### 0/ MISP Ubuntu 20.04-server install - status ------------------------- !!! notice - Installer tested working by [@SteveClement](https://twitter.com/SteveClement) on 20190513 (works with **Ubuntu 18.10/19.04** too) + Installer tested working by [@SteveClement](https://twitter.com/SteveClement) on 20200427 !!! notice This document also serves as a source for the [INSTALL-misp.sh](https://github.com/MISP/MISP/blob/2.4/INSTALL/INSTALL.sh) script. @@ -28,14 +28,14 @@ bash /tmp/INSTALL.sh -c Henceforth the document will also follow a more logical flow. In the sense that all the dependencies are installed first then config files are generated, etc... !!! notice - If the next line is `[!generic/core.md!]()` [click here](https://misp.github.io/MISP/INSTALL.ubuntu1804/). + If the next line is `[!generic/core.md!]()` [click here](https://misp.github.io/MISP/INSTALL.ubuntu2004/). {!generic/core.md!} ### 1/ Minimal Ubuntu install ------------------------- -#### Install a minimal Ubuntu 18.04-server system with the software: +#### Install a minimal Ubuntu 20.04-server system with the software: - OpenSSH server - This guide assumes a user name of 'misp' with sudo working @@ -104,18 +104,18 @@ installCoreDeps () { } # -# -# Install Php 7.2 dependencies -installDepsPhp72 () { - debug "Installing PHP 7.2 dependencies" - PHP_ETC_BASE=/etc/php/7.2 +# +# Install Php 7.4 dependencies +installDepsPhp74 () { + debug "Installing PHP 7.4 dependencies" + PHP_ETC_BASE=/etc/php/7.4 PHP_INI=${PHP_ETC_BASE}/apache2/php.ini sudo apt update sudo apt install -qy \ libapache2-mod-php \ php php-cli \ php-dev \ - php-json php-xml php-mysql php7.2-opcache php-readline php-mbstring \ + php-json php-xml php-mysql php7.4-opcache php-readline php-mbstring \ php-redis php-gnupg \ php-gd @@ -124,7 +124,7 @@ installDepsPhp72 () { sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI done } -# +# ``` ### 3/ MISP code diff --git a/mkdocs.yml b/mkdocs.yml index a1b54cb75..b9c6b508e 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -14,7 +14,7 @@ edit_uri: "" #dev_addr: "192.168.10.34:8000" # Copyright -copyright: "Copyright © 2019 MISP Project" +copyright: "Copyright © 2020 MISP Project" # Options extra: @@ -69,6 +69,7 @@ nav: - Home: 'index.md' - Install Guides: - 'Ubuntu 18.04': 'INSTALL.ubuntu1804.md' + - 'Ubuntu 20.04': 'INSTALL.ubuntu2004.md' - 'Kali Linux': 'INSTALL.kali.md' - 'RHEL7/CentOS7': 'INSTALL.rhel7.md' - 'RHEL8/CentOS8': 'INSTALL.rhel8.md' @@ -76,10 +77,10 @@ nav: - 'Warning': 'xINSTALL.md' - 'Centos 6': 'xINSTALL.centos6.md' - 'Debian 10': 'xINSTALL.debian10.md' - - 'Debian 9.9': 'xINSTALL.debian9.md' + - 'Debian 9': 'xINSTALL.debian9.md' - 'Ubuntu 18.04 \w webmin': 'xINSTALL.ubuntu1804.with.webmin.md' - 'Tsurugi Linux': 'xINSTALL.tsurugi.md' - - 'OpenBSD 6.5': 'xINSTALL.OpenBSD.md' + - 'OpenBSD 6.6': 'xINSTALL.OpenBSD.md' - Config Guides: - 'Elastic Search Logging': 'CONFIG.elasticsearch-logging.md' - 'Amazon S3 attachments': 'CONFIG.s3-attachments.md'