mirror of https://github.com/MISP/MISP
Merge branch '2.4' of github.com:MISP/MISP into 2.4
commit
be946bf09b
|
@ -673,8 +673,7 @@ setBaseURL () {
|
|||
CONN=$(ip -br -o -4 a |grep UP |head -1 |tr -d "UP")
|
||||
IFACE=`echo $CONN |awk {'print $1'}`
|
||||
IP=`echo $CONN |awk {'print $2'}| cut -f1 -d/`
|
||||
# TODO: Consider "QEMU"
|
||||
if [[ "$(checkManufacturer)" != "innotek GmbH" ]] && [[ "$(checkManufacturer)" != "VMware, Inc." ]]; then
|
||||
if [[ "$(checkManufacturer)" != "innotek GmbH" ]] && [[ "$(checkManufacturer)" != "VMware, Inc." ]] && [[ "$(checkManufacturer)" != "QEMU" ]]; then
|
||||
debug "We guess that this is a physical machine and cannot possibly guess what the MISP_BASEURL might be."
|
||||
if [[ "$UNATTENDED" != "1" ]]; then
|
||||
echo "You can now enter your own MISP_BASEURL, if you wish to NOT do that, the MISP_BASEURL will be empty, which will work, but ideally you configure it afterwards."
|
||||
|
@ -2665,16 +2664,16 @@ installSupported () {
|
|||
[[ -n $CORE ]] || [[ -n $ALL ]] && installDepsPhp72
|
||||
elif [[ "$PHP_VER" == 7.3 ]]; then
|
||||
# Install PHP 7.4 Dependencies - functionLocation('INSTALL.ubuntu2004.md')
|
||||
[[ -n $CORE ]] || [[ -n $ALL ]] && installDepsPhp74
|
||||
[[ -n $CORE ]] || [[ -n $ALL ]] && installDepsPhp73
|
||||
elif [[ "$PHP_VER" == 7.4 ]]; then
|
||||
# Install PHP 7.3 Dependencies - functionLocation('generic/supportFunctions.md')
|
||||
[[ -n $CORE ]] || [[ -n $ALL ]] && installDepsPhp73
|
||||
[[ -n $CORE ]] || [[ -n $ALL ]] && installDepsPhp74
|
||||
elif [[ "$PHP_VER" == 7.0 ]]; then
|
||||
# Install PHP 7.0 Dependencies - functionLocation('generic/supportFunctions.md')
|
||||
[[ -n $CORE ]] || [[ -n $ALL ]] && installDepsPhp70
|
||||
fi
|
||||
else
|
||||
# Install PHP 7.2 Dependencies - functionLocation('INSTALL.ubuntu1804.md')
|
||||
# Install PHP 7.2 Dependencies by dangerous default - functionLocation('INSTALL.ubuntu1804.md')
|
||||
[[ -n $CORE ]] || [[ -n $ALL ]] && installDepsPhp72
|
||||
fi
|
||||
progress 4
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
; Generated by RHash v1.3.8 on 2020-04-30 at 15:20.13
|
||||
; Generated by RHash v1.3.8 on 2020-04-30 at 19:46.06
|
||||
; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
|
||||
;
|
||||
; 131010 15:20.13 2020-04-30 INSTALL.sh
|
||||
INSTALL.sh 660E0D51D88B57CE5BE725117482207E39371038 DCF69118CD37B43C308FD25E6BADAF03549BAF0FFA2AC11A1E919005D700F4AC 74E03A8054AF2E4BCB90426A3B813F57BF032734AB7B4E9D4F6F96961D7371FB051180BEE8357642EB9CC58603C13DA3 C4D1D02980808A92E8E11C72A49AA354DDEFA71C6E85FAC739645CEDEB4B36415243F7FB4B8BC75B6AE7B5D9660E0F88A35E884EBD51EA107128B0D7FB20C946
|
||||
; 131047 19:46.06 2020-04-30 INSTALL.sh
|
||||
INSTALL.sh EB4930E5F943CCEB2D8B058DEB29D0205FBCBE04 8B77E8C17ECF325D89BDC3F48F3B38A8AEB4FD397EB33FF8F28856251A7FC128 26E91AEBD71BFD649D0BE4E2F7881B10AF294F1DD5DFA09B23C49E1CD66E2BDA7895B5E50EAE628055D07E964BDDFB36 FAB07C7E4C827244CCCF467DFEC27F09E67B19D541345DC4A28FC34E1BDC4FC6F480DC142FCA654EDB1C1DEEF8645B5B39C8B1D9DEF7F633FA9DE32D33F40C8A
|
||||
|
|
|
@ -1 +1 @@
|
|||
660e0d51d88b57ce5be725117482207e39371038 INSTALL.sh
|
||||
eb4930e5f943cceb2d8b058deb29d0205fbcbe04 INSTALL.sh
|
||||
|
|
|
@ -1 +1 @@
|
|||
dcf69118cd37b43c308fd25e6badaf03549baf0ffa2ac11a1e919005d700f4ac INSTALL.sh
|
||||
8b77e8c17ecf325d89bdc3f48f3b38a8aeb4fd397eb33ff8f28856251a7fc128 INSTALL.sh
|
||||
|
|
|
@ -1 +1 @@
|
|||
74e03a8054af2e4bcb90426a3b813f57bf032734ab7b4e9d4f6f96961d7371fb051180bee8357642eb9cc58603c13da3 INSTALL.sh
|
||||
26e91aebd71bfd649d0be4e2f7881b10af294f1dd5dfa09b23c49e1cd66e2bda7895b5e50eae628055d07e964bddfb36 INSTALL.sh
|
||||
|
|
|
@ -1 +1 @@
|
|||
c4d1d02980808a92e8e11c72a49aa354ddefa71c6e85fac739645cedeb4b36415243f7fb4b8bc75b6ae7b5d9660e0f88a35e884ebd51ea107128b0d7fb20c946 INSTALL.sh
|
||||
fab07c7e4c827244cccf467dfec27f09e67b19d541345dc4a28fc34e1bdc4fc6f480dc142fca654edb1c1deef8645b5b39c8b1d9def7f633fa9de32d33f40c8a INSTALL.sh
|
||||
|
|
|
@ -283,16 +283,16 @@ installSupported () {
|
|||
[[ -n $CORE ]] || [[ -n $ALL ]] && installDepsPhp72
|
||||
elif [[ "$PHP_VER" == 7.3 ]]; then
|
||||
# Install PHP 7.4 Dependencies - functionLocation('INSTALL.ubuntu2004.md')
|
||||
[[ -n $CORE ]] || [[ -n $ALL ]] && installDepsPhp74
|
||||
[[ -n $CORE ]] || [[ -n $ALL ]] && installDepsPhp73
|
||||
elif [[ "$PHP_VER" == 7.4 ]]; then
|
||||
# Install PHP 7.3 Dependencies - functionLocation('generic/supportFunctions.md')
|
||||
[[ -n $CORE ]] || [[ -n $ALL ]] && installDepsPhp73
|
||||
[[ -n $CORE ]] || [[ -n $ALL ]] && installDepsPhp74
|
||||
elif [[ "$PHP_VER" == 7.0 ]]; then
|
||||
# Install PHP 7.0 Dependencies - functionLocation('generic/supportFunctions.md')
|
||||
[[ -n $CORE ]] || [[ -n $ALL ]] && installDepsPhp70
|
||||
fi
|
||||
else
|
||||
# Install PHP 7.2 Dependencies - functionLocation('INSTALL.ubuntu1804.md')
|
||||
# Install PHP 7.2 Dependencies by dangerous default - functionLocation('INSTALL.ubuntu1804.md')
|
||||
[[ -n $CORE ]] || [[ -n $ALL ]] && installDepsPhp72
|
||||
fi
|
||||
progress 4
|
||||
|
|
Loading…
Reference in New Issue