From e3afeaff588fd5c1feeac52cf3a82672ebb0ee65 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Sat, 20 Apr 2019 12:44:08 +0900
Subject: [PATCH] chg: [tools] Updated installer

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

diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh
index 5f00629fa..49b4a97b9 100755
--- a/INSTALL/INSTALL.sh
+++ b/INSTALL/INSTALL.sh
@@ -336,21 +336,21 @@ checkID () {
       echo "User $MISP_USER added, password is: $MISP_PASSWORD"
     elif [[ $ANSWER == "n" ]]; then
       echo "Using $USER as install user, hope that is what you want."
-      echo -e "${RED}Adding $USER to groups www-data and staff${NC}"
+      echo -e "${RED}Adding $USER to groups $WWW_USER and staff${NC}"
       MISP_USER=$USER
       sudo adduser $MISP_USER staff
-      sudo adduser $MISP_USER www-data
+      sudo adduser $MISP_USER $WWW_USER
     else
       echo "yes or no was asked, try again."
       sudo adduser $MISP_USER staff
-      sudo adduser $MISP_USER www-data
+      sudo adduser $MISP_USER $WWW_USER
       exit 1
     fi
   else
     echo "User ${MISP_USER} exists, skipping creation"
-    echo -e "${RED}Adding $MISP_USER to groups www-data and staff${NC}"
+    echo -e "${RED}Adding $MISP_USER to groups $WWW_USER and staff${NC}"
     sudo adduser $MISP_USER staff
-    sudo adduser $MISP_USER www-data
+    sudo adduser $MISP_USER $WWW_USER
   fi
 }
 
@@ -741,7 +741,7 @@ alias composer70='composer72'
 # Composer on php 7.2 does not need any special treatment the provided phar works well
 composer72 () {
   cd $PATH_TO_MISP/app
-  mkdir /var/www/.composer ; chown www-data:www-data /var/www/.composer
+  mkdir /var/www/.composer ; chown $WWW_USER:$WWW_USER /var/www/.composer
   $SUDO_WWW php composer.phar require kamisama/cake-resque:4.1.2
   $SUDO_WWW php composer.phar config vendor-dir Vendor
   $SUDO_WWW php composer.phar install
@@ -750,16 +750,16 @@ composer72 () {
 # Composer on php 7.3 needs a recent version of composer.phar
 composer73 () {
   cd $PATH_TO_MISP/app
-  mkdir /var/www/.composer ; chown www-data:www-data /var/www/.composer
+  mkdir /var/www/.composer ; chown $WWW_USER:$WWW_USER /var/www/.composer
   # Update composer.phar
   # If hash changes, check here: https://getcomposer.org/download/ and replace with the correct one
   # Current Sum for: v1.8.3
   SHA384_SUM='48e3236262b34d30969dca3c37281b3b4bbe3221bda826ac6a9a62d6444cdb0dcd0615698a5cbe587c3f0fe57a54d8f5'
-  sudo -H -u www-data php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-  sudo -H -u www-data php -r "if (hash_file('SHA384', 'composer-setup.php') === '$SHA384_SUM') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); exit(137); } echo PHP_EOL;"
+  $SUDO_WWW php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+  $SUDO_WWW php -r "if (hash_file('SHA384', 'composer-setup.php') === '$SHA384_SUM') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); exit(137); } echo PHP_EOL;"
   checkFail "composer.phar checksum failed, please investigate manually. " $?
-  sudo -H -u www-data php composer-setup.php
-  sudo -H -u www-data php -r "unlink('composer-setup.php');"
+  $SUDO_WWW php composer-setup.php
+  $SUDO_WWW php -r "unlink('composer-setup.php');"
   $SUDO_WWW php composer.phar require kamisama/cake-resque:4.1.2
   $SUDO_WWW php composer.phar config vendor-dir Vendor
   $SUDO_WWW php composer.phar install
diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1
index 567d3bfae..ccb0b16b6 100644
--- a/INSTALL/INSTALL.sh.sha1
+++ b/INSTALL/INSTALL.sh.sha1
@@ -1 +1 @@
-d74b8f454286d09dbf5d2e5f06bd33ab6816f608  INSTALL.sh
+4c9f2cf4761fbade4ae0243fc17303645e8eb369  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256
index 139cfbbee..0ec70a8b1 100644
--- a/INSTALL/INSTALL.sh.sha256
+++ b/INSTALL/INSTALL.sh.sha256
@@ -1 +1 @@
-dd1bc60f83a4dcf7098e2322da635a8e16332d96b2d42f4bbe20202ec712e56a  INSTALL.sh
+61cfbd84454f0fe2c1be3cbe0e1b7cc9516ed7e3e7a58a1e0c0c486d0054e738  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384
index e9779b7a3..203f47605 100644
--- a/INSTALL/INSTALL.sh.sha384
+++ b/INSTALL/INSTALL.sh.sha384
@@ -1 +1 @@
-78f2ecc0516fbd5327f69b7ea79087a4a9ee0ec99fc799df6b04866d26548e13204d0094528faa525efd1dd1c07544cf  INSTALL.sh
+049288e60be20447ba1dd7dd1a930f04d37a15af24d00440b7957b6f78d15e48090acc5f0321328c7fbe18e1702ae1fe  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512
index 3e650e14b..a6da0d9b1 100644
--- a/INSTALL/INSTALL.sh.sha512
+++ b/INSTALL/INSTALL.sh.sha512
@@ -1 +1 @@
-5cc657170c118c30cb34cc55821be4760981031e5167071f3f117b5c4c3c74cd3516e954e51f0ddc93b98de7f040c10ec013ae424611f947edd222cfd397e47b  INSTALL.sh
+95f590047a813316cc6aa3ae418b656949be96701c96676500a5b3624b68b04a9f6e0020635544963151882cad37ec1c54691d85a709a05ad842643221fd13aa  INSTALL.sh