chg: [installer] Updated installer

pull/4798/head
Steve Clement 2019-06-25 17:06:47 +09:00
parent 50f1c9fbfc
commit adadf6c338
No known key found for this signature in database
GPG Key ID: 69A20F509BE4AEE9
6 changed files with 15 additions and 8 deletions

View File

@ -400,11 +400,17 @@ ask_o () {
}
clean () {
rm /tmp/INSTALL.stat
rm /tmp/INSTALL.sh.*
}
# Check if misp user is present and if run as root
checkID () {
debug "Checking if run as root and $MISP_USER is present"
if [[ $EUID == 0 ]]; then
echo "This script cannot be run as a root"
clean > /dev/null 2>&1
exit 1
elif [[ $(id $MISP_USER >/dev/null; echo $?) -ne 0 ]]; then
if [[ "$UNATTENDED" != "1" ]]; then
@ -547,6 +553,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
debug "We guess that this is a physical machine and cannot possibly guess what the MISP_BASEURL might be."
if [[ "$UNATTENDED" != "1" ]]; then
@ -1041,7 +1048,7 @@ installDepsPhp72 () {
libapache2-mod-php \
php php-cli \
php-dev \
php-json php-xml php-mysql php-opcache php-readline php-mbstring \
php-json php-xml php-mysql php7.2-opcache php-readline php-mbstring \
php-pear \
php-redis php-gnupg \
php-gd

View File

@ -1,5 +1,5 @@
; Generated by RHash v1.3.8 on 2019-06-20 at 14:00.36
; Generated by RHash v1.3.8 on 2019-06-25 at 17:06.42
; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
;
; 95437 14:00.36 2019-06-20 INSTALL.sh
INSTALL.sh 8CFDF8FC14572C9AA51673D7449C354257C6CE67 61B8976709B44B3F2C0491EDB6FA013AC15BA4833F074929810C65C93C274FCB 75D5538717565401F180E7C777BE41A167B2365473806141C9357E75220DD198BE68DC2B59452F39396B42FB50208194 460D731E91EAA0F589B96D13CC451BCB7014C683A357099B13492E7683A459ECB7C2A43AFFB237C966CE67DD06140199686E968B518A33ED73C84135948E0749
; 95553 17:06.42 2019-06-25 INSTALL.sh
INSTALL.sh E8321683D589173C14120559D587C2A92212E76B 39F225C90D1295193DFD711EA68124AA4156E191F79C10E90E1AACE235B82B0E B87BC3FD6186B4480C2796CE2DB63807CEA7A79A4CA51BBD0F1B637F456EE598EE0B00687193C4A7FADC778D946859FC 04B0437F0337F96EADB1F16B9F50FD92A420D478DAB9A83DE81FBCC446FC75BE28079C0BC9D47E145419E7B13AB560A868338F6E2646B070F43CB28BEEB1D929

View File

@ -1 +1 @@
8cfdf8fc14572c9aa51673d7449c354257c6ce67 INSTALL.sh
e8321683d589173c14120559d587c2a92212e76b INSTALL.sh

View File

@ -1 +1 @@
61b8976709b44b3f2c0491edb6fa013ac15ba4833f074929810c65c93c274fcb INSTALL.sh
39f225c90d1295193dfd711ea68124aa4156e191f79c10e90e1aace235b82b0e INSTALL.sh

View File

@ -1 +1 @@
75d5538717565401f180e7c777be41a167b2365473806141c9357e75220dd198be68dc2b59452f39396b42fb50208194 INSTALL.sh
b87bc3fd6186b4480c2796ce2db63807cea7a79a4ca51bbd0f1b637f456ee598ee0b00687193c4a7fadc778d946859fc INSTALL.sh

View File

@ -1 +1 @@
460d731e91eaa0f589b96d13cc451bcb7014c683a357099b13492e7683a459ecb7c2a43affb237c966ce67dd06140199686e968b518a33ed73c84135948e0749 INSTALL.sh
04b0437f0337f96eadb1f16b9f50fd92a420d478dab9a83de81fbcc446fc75be28079c0bc9d47e145419e7b13ab560a868338f6e2646b070f43cb28beeb1d929 INSTALL.sh