Merge pull request #5841 from SteveClement/guides

fix: [installer] Bug where the wrong php deps would get installed

INSTALL/INSTALL.tpl.sh

@@ -278,16 +278,16 @@ installSupported () {
 
   if [[ "$1" =~ ^PHP= ]]; then
     PHP_VER=$(echo $1 |cut -f2 -d=)
-    if [[ "$PHP_VER" == "7.2" ]]; then
+    if [[ "$PHP_VER" == 7.2 ]]; then
       # Install PHP 7.2 Dependencies - functionLocation('INSTALL.ubuntu1804.md')
       [[ -n $CORE ]]   || [[ -n $ALL ]] && installDepsPhp72
-    elif [[ "$PHP_VER" == "7.3" ]]; then
+    elif [[ "$PHP_VER" == 7.3 ]]; then
       # Install PHP 7.4 Dependencies - functionLocation('INSTALL.ubuntu2004.md')
       [[ -n $CORE ]]   || [[ -n $ALL ]] && installDepsPhp74
-    elif [[ "$PHP_VER" == "7.4" ]]; then
+    elif [[ "$PHP_VER" == 7.4 ]]; then
       # Install PHP 7.3 Dependencies - functionLocation('generic/supportFunctions.md')
       [[ -n $CORE ]]   || [[ -n $ALL ]] && installDepsPhp73
-    elif [[ "$PHP_VER" == "7.0" ]]; then
+    elif [[ "$PHP_VER" == 7.0 ]]; then
       # Install PHP 7.0 Dependencies - functionLocation('generic/supportFunctions.md')
       [[ -n $CORE ]]   || [[ -n $ALL ]] && installDepsPhp70
     fi

docs/generic/supportFunctions.md

@@ -542,12 +542,20 @@ setBaseURL () {
     MISP_BASEURL="https://misp.local"
     # Webserver configuration
     FQDN='misp.local'
-  else
+  elif [[ "$(checkManufacturer)" == "innotek GmbH" ]]; then
     MISP_BASEURL='https://localhost:8443'
     IP=$(ip addr show | awk '$1 == "inet" {gsub(/\/.*$/, "", $2); print $2}' |grep -v "127.0.0.1" |tail -1)
     sudo iptables -t nat -A OUTPUT -p tcp --dport 8443 -j DNAT --to ${IP}:443
     # Webserver configuration
     FQDN='localhost.localdomain'
+  elif [[ "$(checkManufacturer)" == "VMware, Inc." ]]; then
+    MISP_BASEURL='""'
+    # Webserver configuration
+    FQDN='misp.local'
+  else
+    MISP_BASEURL='""'
+    # Webserver configuration
+    FQDN='misp.local'
   fi
 }