From 02d3cc37bd0ba28a9c11f438f50fe2b15f8b19aa Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Fri, 19 Apr 2019 19:25:56 +0900
Subject: [PATCH] chg: [tools] Updated installer

---
 INSTALL/INSTALL.sh        | 8 +++++++-
 INSTALL/INSTALL.sh.sha1   | 2 +-
 INSTALL/INSTALL.sh.sha256 | 2 +-
 INSTALL/INSTALL.sh.sha384 | 2 +-
 INSTALL/INSTALL.sh.sha512 | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh
index 981195735..acbb1b086 100755
--- a/INSTALL/INSTALL.sh
+++ b/INSTALL/INSTALL.sh
@@ -128,7 +128,11 @@ MISPvars () {
   CAKE="$PATH_TO_MISP/app/Console/cake"
 
   # sudo config to run $LUSER commands
-  SUDO_USER="sudo -H -u ${MISP_USER} "
+  if [[ "$(groups |grep -o 'staff')" == "staff" ]]; then
+    SUDO_USER="sudo -H -u ${MISP_USER} -g staff"
+  else
+    SUDO_USER="sudo -H -u ${MISP_USER}"
+  fi
   SUDO_WWW="sudo -H -u ${WWW_USER} "
 
   echo "The following DB Passwords were generated..."
@@ -479,6 +483,8 @@ setBaseURL () {
     FQDN='misp.local'
   else
     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 -I PREROUTING --src 0/0 --dst ${IP} tcp --dport 8443 -j REDIRECT --to-ports 443
     # Webserver configuration
     FQDN='localhost.localdomain'
   fi
diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1
index dc1fb6f1d..557efc33a 100644
--- a/INSTALL/INSTALL.sh.sha1
+++ b/INSTALL/INSTALL.sh.sha1
@@ -1 +1 @@
-42fa13c166224e2cefca3aca82d5860a8a7e21fc  INSTALL.sh
+b2dec805ec99ec608b41d006c85c9d28343d6a5e  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256
index 33eca3bff..feeaf4abf 100644
--- a/INSTALL/INSTALL.sh.sha256
+++ b/INSTALL/INSTALL.sh.sha256
@@ -1 +1 @@
-04ab69f42b1ffa62955caa34ba0b0719def56f290df804016e1739e6942be05d  INSTALL.sh
+ce1ee8e86a7d6bb3b10cb6efb08889ceece324eda7b3ee2c7119c186586db3db  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384
index c16d77130..7da3428ff 100644
--- a/INSTALL/INSTALL.sh.sha384
+++ b/INSTALL/INSTALL.sh.sha384
@@ -1 +1 @@
-8ca42cb7c876007257058e0f2e35712e54ba9a5787b2406a2030a19cb238bd92e90ca405029a7ae3d7184d13da861975  INSTALL.sh
+d8227b4cc5531333d864fae1e8d02378dc4b4a3b0fdb119ad904ad5b2bf411e2454861e3f8208e3cecd26d4501f9bae6  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512
index 9a40217d4..3fe3c50db 100644
--- a/INSTALL/INSTALL.sh.sha512
+++ b/INSTALL/INSTALL.sh.sha512
@@ -1 +1 @@
-b9ddf51f323409f53c8568fc65f75740558a5cd30a5700cdd8d8dce583eb69b346b2c4d2074e5660319bd4e4cd816d768bf0c94812b2c9f7a6d514f580d65f42  INSTALL.sh
+a6f16511882ad8ea35b84e7aaf9b7a2759d7cdcb63e979e377a60e328e51ab4d816a47956d219c3c2030539d781e09c83bcb5687d5e7ec577ee380c52df46617  INSTALL.sh