chg: [doc] Update to Debian 10 install guide, everything works as

expected.
chg: [doc] OpenBSD is broken for misp-modules (OpenCV etc)

docs/generic/sudo_etckeeper.md

@@ -11,8 +11,10 @@ checkSudoKeeper () {
     su -c "apt install etckeeper -y"
     echo "Please enter your root password below to install sudo"
     su -c "apt install sudo -y"
+    echo "Please enter your root password below to install sudo"
+    su -c "apt install curl -y"
     echo "Please enter your root password below to add ${MISP_USER} to sudo group"
-    su -c "adduser ${MISP_USER} sudo"
+    su -c "/usr/sbin/adduser ${MISP_USER} sudo"
     echo "We added ${MISP_USER} to group sudo and now we need to log out and in again."
     exit
   else

docs/xINSTALL.OpenBSD.md

@@ -5,6 +5,7 @@
     This is not fully working yet. Mostly it is a template for our ongoing documentation efforts :spider:
     LIEF, will probably not be available for a long long time on OpenBSD, until someone is brave enough to make it work.
     GnuPG also needs some more TLC.
+    misp-modules are broken because of the python-opencv dependency.
 
 ### 0/ WIP! You are warned, this does only partially work!
 ------------
@@ -50,7 +51,7 @@ echo "permit nopass setenv { ENV PS1 HOME=/var/www } www" >> /etc/doas.conf
 
 ```bash
 cd /tmp
-ftp https://ftp.openbsd.org/pub/OpenBSD/$(uname -r)/{ports.tar.gz,SHA256.sig}
+ftp https://cdn.openbsd.org/pub/OpenBSD/$(uname -r)/{ports.tar.gz,SHA256.sig}
 signify -Cp /etc/signify/openbsd-$(uname -r | cut -c 1,3)-base.pub -x SHA256.sig ports.tar.gz
 doas tar -x -z -f /tmp/ports.tar.gz -C /usr
 ```
@@ -59,10 +60,10 @@ doas tar -x -z -f /tmp/ports.tar.gz -C /usr
 
 ```bash
 cd /tmp
-ftp https://ftp.openbsd.org/pub/OpenBSD/$(uname -r)/$(uname -m)/{xbase$(uname -r| tr -d \.).tgz,SHA256.sig}
+ftp https://cdn.openbsd.org/pub/OpenBSD/$(uname -r)/$(uname -m)/{xbase$(uname -r| tr -d \.).tgz,SHA256.sig}
 signify -Cp /etc/signify/openbsd-$(uname -r | cut -c 1,3)-base.pub -x SHA256.sig xbase$(uname -r |tr -d \.).tgz
 doas tar -xzphf /tmp/xbase$(uname -r| tr -d \.).tgz -C /
-ftp https://ftp.openbsd.org/pub/OpenBSD/$(uname -r)/$(uname -m)/{xshare$(uname -r| tr -d \.).tgz,SHA256.sig}
+ftp https://cdn.openbsd.org/pub/OpenBSD/$(uname -r)/$(uname -m)/{xshare$(uname -r| tr -d \.).tgz,SHA256.sig}
 signify -Cp /etc/signify/openbsd-$(uname -r | cut -c 1,3)-base.pub -x SHA256.sig xshare$(uname -r |tr -d \.).tgz
 doas tar -xzphf /tmp/xshare$(uname -r| tr -d \.).tgz -C /
 ```
@@ -408,9 +409,13 @@ doas /usr/local/virtualenvs/MISP/bin/pip install git+https://github.com/kbandla/
 # Install CakeResque along with its dependencies if you intend to use the built in background jobs:
 cd /var/www/htdocs/MISP/app
 doas mkdir /var/www/.composer ; doas chown www:www /var/www/.composer
-doas -u www php composer.phar require kamisama/cake-resque:4.1.2
-doas -u www php composer.phar config vendor-dir Vendor
-doas -u www php composer.phar install
+doas -u www php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+doas -u www php -r "if (hash_file('SHA384', 'composer-setup.php') === '48e3236262b34d30969dca3c37281b3b4bbe3221bda826ac6a9a62d6444cdb0dcd0615698a5cbe587c3f0fe57a54d8f5') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+doas -u www env HOME=/var/www php composer-setup.php
+doas -u www php -r "unlink('composer-setup.php');"
+doas -u www env HOME=/var/www php composer.phar require kamisama/cake-resque:4.1.2
+doas -u www env HOME=/var/www php composer.phar config vendor-dir Vendor
+doas -u www env HOME=/var/www php composer.phar install
 
 # To use the scheduler worker for scheduled tasks, do the following:
 doas -u www cp -f /var/www/htdocs/MISP/INSTALL/setup/config.php /var/www/htdocs/MISP/app/Plugin/CakeResque/Config/config.php

docs/xINSTALL.debian10.md

@@ -1,5 +1,5 @@
 # INSTALLATION INSTRUCTIONS
-## for Debian testing "buster" server
+## for Debian 10 "buster"
 
 ### 0/ MISP testing dev install - Status
 ------------------------------------
@@ -18,9 +18,6 @@
 ```bash
 PHP_ETC_BASE=/etc/php/7.3
 PHP_INI=${PHP_ETC_BASE}/apache2/php.ini
-
-sudo adduser $MISP_USER staff
-sudo adduser $MISP_USER $WWW_USER
 ```
 
 ### 1/ Minimal Debian install
@@ -34,10 +31,18 @@ sudo adduser $MISP_USER $WWW_USER
 
 {!generic/ethX.md!}
 
-#### Make sure your system is up2date
+#### Add $MISP_USER to staff and $WWW_USER
+
+```bash
+sudo adduser $MISP_USER staff
+sudo adduser $MISP_USER $WWW_USER
+```
+
+#### Make sure your system is up2date and curl installed
 ```bash
 sudo apt update
 sudo apt dist-upgrade -y
+sudo apt install curl -y
 ```
 
 #### install postfix, there will be some questions. (optional)

docs/xINSTALL.debian9.md

@@ -4,6 +4,10 @@
 ### 0/ MISP debian stable install - Status
 ------------------------------------
 
+!!! notice
+    Please use [Debian 10](https://misp.github.io/MISP/xINSTALL.debian10/) as everything works as expected.
+
+
 !!! notice
     Maintained and tested by @SteveClement on 20190702
 

mkdocs.yml

@@ -75,8 +75,8 @@ nav:
     - xInstall Guides: 
       - 'Warning': 'xINSTALL.md'
       - 'Centos 6': 'xINSTALL.centos6.md'
-      - 'Debian stable': 'xINSTALL.debian9.md'
-      - 'Debian testing': 'xINSTALL.debian_testing.md'
+      - 'Debian 10': 'xINSTALL.debian10.md'
+      - 'Debian 9.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'