diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh index 266bc1a79..dcca598df 100644 --- a/INSTALL/INSTALL.sh +++ b/INSTALL/INSTALL.sh @@ -985,8 +985,8 @@ genRCLOCAL () { # Run PyMISP tests runTests () { - echo "url = ${MISP_BASEURL} -key = ${AUTH_KEY}" |sudo tee ${PATH_TO_MISP}/PyMISP/tests/keys.py + echo "url = '${MISP_BASEURL}' +key = '${AUTH_KEY}'" |sudo tee ${PATH_TO_MISP}/PyMISP/tests/keys.py sudo chown -R $WWW_USER:$WWW_USER $PATH_TO_MISP/PyMISP/ sudo -H -u $WWW_USER sh -c "cd $PATH_TO_MISP/PyMISP && git submodule foreach git pull origin master" @@ -1308,7 +1308,7 @@ installCore () { $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 + $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install zmq redis # install python-magic $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install python-magic @@ -1395,7 +1395,7 @@ coreCAKE () { $SUDO_WWW $RUN_PHP -- $CAKE userInit -q # This makes sure all Database upgrades are done, without logging in. - $SUDO_WWW $RUN_PHP -- $CAKE Admin updateDatabase + $SUDO_WWW $RUN_PHP -- $CAKE Admin runUpdates # The default install is Python >=3.6 in a virtualenv, setting accordingly $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.python_bin" "${PATH_TO_MISP}/venv/bin/python" diff --git a/INSTALL/INSTALL.sh.sfv b/INSTALL/INSTALL.sh.sfv index 11c375fb1..87f4e6b15 100644 --- a/INSTALL/INSTALL.sh.sfv +++ b/INSTALL/INSTALL.sh.sfv @@ -1,5 +1,5 @@ -; Generated by RHash v1.3.8 on 2019-10-12 at 23:45.03 +; Generated by RHash v1.3.8 on 2019-11-09 at 13:08.33 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/ ; -; 99015 23:45.03 2019-10-12 INSTALL.sh -INSTALL.sh 0A4A963E90CD83550F59CBC270CEF3DB3E25DBDF D292D42E306A3E19FCD9A6C10B1A28F56584810D49420592A9A6644BB3EFB2E6 7453482ADF587B9760B23A0563FADE99568E497CF810BAE9CD7E44F0025D8D6BFE1B17DD2C790A6CCD72130A72CD59C6 E6BEACA555D8752D210757BE8A372AF7BA8675CA293810B8A5ADEE905FC44D41CDAD60225203D8E93B037D520703996E03E62B501EB766290C452716BB125C4F +; 99021 13:08.33 2019-11-09 INSTALL.sh +INSTALL.sh A607BC5BA7F4C81E97A5BEA6FAAE35C289899625 D9BE26A0A2DF33755382BA5090F7EF8F7212FE80771B3149FBEB94CE13530856 33C3C7F6C2B327E2E73392A7B35518622D6AEDD265B5CB210DD3E0723F0A8FE4328CFF4883F605198B09E197E917B214 F1CBEEE0471B9813591F71655290A38B2DADB5BA86D365C87AF44263E9D4223B719194CA7BF283BA584C31F4C04209F012C56B3063F36C00DD7E386C0D53622E diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1 index f1411624f..c1c873587 100644 --- a/INSTALL/INSTALL.sh.sha1 +++ b/INSTALL/INSTALL.sh.sha1 @@ -1 +1 @@ -0a4a963e90cd83550f59cbc270cef3db3e25dbdf INSTALL.sh +a607bc5ba7f4c81e97a5bea6faae35c289899625 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256 index def068cd8..633aa1639 100644 --- a/INSTALL/INSTALL.sh.sha256 +++ b/INSTALL/INSTALL.sh.sha256 @@ -1 +1 @@ -d292d42e306a3e19fcd9a6c10b1a28f56584810d49420592a9a6644bb3efb2e6 INSTALL.sh +d9be26a0a2df33755382ba5090f7ef8f7212fe80771b3149fbeb94ce13530856 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384 index 46f95f6c1..6ad852094 100644 --- a/INSTALL/INSTALL.sh.sha384 +++ b/INSTALL/INSTALL.sh.sha384 @@ -1 +1 @@ -7453482adf587b9760b23a0563fade99568e497cf810bae9cd7e44f0025d8d6bfe1b17dd2c790a6ccd72130a72cd59c6 INSTALL.sh +33c3c7f6c2b327e2e73392a7b35518622d6aedd265b5cb210dd3e0723f0a8fe4328cff4883f605198b09e197e917b214 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512 index 68b123cbd..2f69b01d8 100644 --- a/INSTALL/INSTALL.sh.sha512 +++ b/INSTALL/INSTALL.sh.sha512 @@ -1 +1 @@ -e6beaca555d8752d210757be8a372af7ba8675ca293810b8a5adee905fc44d41cdad60225203d8e93b037d520703996e03e62b501eb766290c452716bb125c4f INSTALL.sh +f1cbeee0471b9813591f71655290a38b2dadb5ba86d365c87af44263e9d4223b719194ca7bf283ba584c31f4c04209f012c56b3063f36c00dd7e386c0d53622e INSTALL.sh diff --git a/docs/INSTALL.ubuntu1804.md b/docs/INSTALL.ubuntu1804.md index c0d0cfda2..7e26bce94 100644 --- a/docs/INSTALL.ubuntu1804.md +++ b/docs/INSTALL.ubuntu1804.md @@ -182,7 +182,7 @@ installCore () { $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 + $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install zmq redis # install python-magic $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install python-magic diff --git a/docs/xINSTALL.debian10.md b/docs/xINSTALL.debian10.md index 6fa719b7f..7dcd32dcd 100644 --- a/docs/xINSTALL.debian10.md +++ b/docs/xINSTALL.debian10.md @@ -173,7 +173,7 @@ $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install git+https://github.com/kbandla/py $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 +$SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install zmq redis # install python-magic $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install python-magic diff --git a/docs/xINSTALL.debian9.md b/docs/xINSTALL.debian9.md index e8adc11f8..e60f19c6f 100644 --- a/docs/xINSTALL.debian9.md +++ b/docs/xINSTALL.debian9.md @@ -198,7 +198,7 @@ $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install git+https://github.com/kbandla/py $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 +$SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install zmq redis # install python-magic $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install python-magic diff --git a/docs/xINSTALL.tsurugi.md b/docs/xINSTALL.tsurugi.md index fa11aff8b..92901a361 100644 --- a/docs/xINSTALL.tsurugi.md +++ b/docs/xINSTALL.tsurugi.md @@ -309,7 +309,7 @@ function installMISPonTsurugi() { chown www-data:www-data misp-dashboard $SUDO_WWW git clone https://github.com/MISP/misp-dashboard.git cd misp-dashboard - $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install zmq + $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install zmq redis /var/www/misp-dashboard/install_dependencies.sh sed -i "s/^host\ =\ localhost/host\ =\ 0.0.0.0/g" /var/www/misp-dashboard/config/config.cfg sed -i -e '$i \sudo -u www-data bash /var/www/misp-dashboard/start_all.sh\n' /etc/rc.local