chg: [doc] Updated Debian testing install docs (#4840)

chg: [doc] Updated Debian testing install docs
2019-07-07 09:46:32 +02:00 · 2019-07-07 09:46:32 +02:00 · f2c4008532
parent ab76eaff05 c26ea4f3ef
commit f2c4008532
5 changed files with 58 additions and 22 deletions
--- a/docs/generic/sudo_etckeeper.md
+++ b/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
--- a/docs/xINSTALL.OpenBSD.md
+++ b/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
--- a/docs/xINSTALL.debian_testing.md
+++ b/docs/xINSTALL.debian_testing.md
@ -1,5 +1,5 @@
 # INSTALLATION INSTRUCTIONS
-## for Debian testing "buster" server
+## for Debian 10 "buster"

 ### 0/ MISP testing dev install - Status
 ------------------------------------
@ -7,7 +7,7 @@
 !!! notice
    This is mostly the install [@SteveClement](https://twitter.com/SteveClement)
    uses for testing, qc and random development.
-    Maintained and tested by @SteveClement on 20190405
+    Maintained and tested by @SteveClement on 20190702

 !!! warning
    PHP 7.3.0RC4 is not working at the moment with the packaged composer.phar<br />
@ -31,10 +31,18 @@ PHP_INI=${PHP_ETC_BASE}/apache2/php.ini

 {!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 -y dist-upgrade
+sudo apt dist-upgrade -y
+sudo apt install curl -y
 ```

 #### install postfix, there will be some questions. (optional)
@ -67,10 +75,10 @@ jq ntp ntpdate jupyter-notebook imagemagick tesseract-ocr \
 libxml2-dev libxslt1-dev zlib1g-dev -y

 # Start haveged to get more entropy (optional)
-sudo apt install haveged -y
+sudo apt install haveged -qqy
 sudo service haveged start

-sudo apt install expect -y
+sudo apt install expect -qqy

 # Add your credentials if needed, if sudo has NOPASS, comment out the relevant lines
 pw="Password1234"
@ -99,7 +107,7 @@ expect -f - <<-EOF
  send -- "y\r"
  expect eof
 EOF
-sudo apt-get purge -y expect ; sudo apt autoremove -y
+sudo apt purge -qqy expect ; sudo apt autoremove -qqy

 # Enable modules, settings, and default of SSL in Apache
 sudo a2dismod status
@ -149,11 +157,29 @@ cd $PATH_TO_MISP/app/files/scripts/python-stix
 $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install .
 cd $PATH_TO_MISP/app/files/scripts/python-maec
 $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install .
+# install STIX2.0 library to support STIX 2.0 export:
+cd ${PATH_TO_MISP}/cti-python-stix2
+$SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install .

 # install PyMISP
 cd $PATH_TO_MISP/PyMISP
 $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install .

+# install pydeep
+$SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install git+https://github.com/kbandla/pydeep.git
+
+# install lief
+$SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install https://github.com/lief-project/packages/raw/lief-master-latest/pylief-0.9.0.dev.zip
+
+# install zmq needed by mispzmq
+$SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install zmq
+
+# install python-magic
+$SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install python-magic
+
+# install plyara
+$SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install plyara
+
 # Install Crypt_GPG and Console_CommandLine
 sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml
 sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml
@ -378,8 +404,8 @@ $SUDO_WWW sh -c "gpg --homedir $PATH_TO_MISP/.gnupg --export --armor $GPG_EMAIL_
 sudo chmod +x $PATH_TO_MISP/app/Console/worker/start.sh

 echo "[Unit]
-Description=MISP's background workers
-After=rh-mariadb102-mariadb.service rh-redis32-redis.service rh-php72-php-fpm.service
+Description=MISP background workers
+After=mariadb.service redis-server.service

 [Service]
 Type=forking
@ -445,7 +471,8 @@ $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install pyzmq

 #### MISP has a feature for publishing events to Kafka. To enable it, simply run the following commands
 ```bash
-sudo apt-get install librdkafka-dev php-dev
+sudo apt install librdkafka-dev php-dev
+sudo pecl channel-update pecl.php.net
 sudo pecl install rdkafka
 echo "extension=rdkafka.so" | sudo tee ${PHP_ETC_BASE}/mods-available/rdkafka.ini
 sudo phpenmod rdkafka
--- a/docs/xINSTALL.debian9.md
+++ b/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

@ -56,9 +60,7 @@ sudo postfix reload

 #### Install all the dependencies (some might already be installed)

-You need to update python3.5 to python3.7 for [PyMISP](https://github.com/MISP/PyMISP) to work properly.
-
-FIXME: The below breaks redis-server and mariadb-server
+You need to use at least Python3.6 for [PyMISP](https://github.com/MISP/PyMISP) to work properly.

 ```bash
 # Manual Python3.7.3 install in $HOME
--- a/mkdocs.yml
+++ b/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'