chg: [sh] If env vars exist, use that value

docs/generic/globalVariables.md

@@ -8,12 +8,12 @@ MISPvars () {
   debug "Setting generic ${LBLUE}MISP${NC} variables shared by all flavours" 2> /dev/null
   # Local non-root MISP user
   MISP_USER="${MISP_USER:-misp}"
-  MISP_PASSWORD="$(openssl rand -hex 32)"
+  MISP_PASSWORD="${MISP_PASSWORD:-$(openssl rand -hex 32)}"
 
   # The web server user
   # RHEL/CentOS
   if [[ -f "/etc/redhat-release" ]]; then
-    WWW_USER='apache'
+    WWW_USER="apache"
     SUDO_WWW="sudo -H -u ${WWW_USER} "
   # Debian flavoured
   elif [[ -f "/etc/debian_version" ]]; then
@@ -43,32 +43,32 @@ MISPvars () {
 
   MISP_BASEURL="${MISP_BASEURL:-""}"
 
-  MISP_LIVE='1'
+  MISP_LIVE="1"
 
   # Database configuration
-  DBHOST='localhost'
-  DBNAME='misp'
-  DBUSER_ADMIN='root'
-  DBPASSWORD_ADMIN="$(openssl rand -hex 32)"
-  DBUSER_MISP='misp'
-  DBPASSWORD_MISP="$(openssl rand -hex 32)"
+  DBHOST="${DBHOST:-localhost}"
+  DBNAME="${DBNAME:-misp}"
+  DBUSER_ADMIN="${DBUSER_ADMIN:-root}"
+  DBPASSWORD_ADMIN="${DBPASSWORD_ADMIN:-$(openssl rand -hex 32)}"
+  DBUSER_MISP="${DBUSER_MISP:-misp}"
+  DBPASSWORD_MISP="${DBPASSWORD_MISP:-$(openssl rand -hex 32)}"
 
   # OpenSSL configuration
   OPENSSL_CN=${FQDN}
-  OPENSSL_C='LU'
-  OPENSSL_ST='State'
-  OPENSSL_L='Location'
-  OPENSSL_O='Organization'
-  OPENSSL_OU='Organizational Unit'
+  OPENSSL_C="LU"
+  OPENSSL_ST="State"
+  OPENSSL_L="Location"
+  OPENSSL_O="Organization"
+  OPENSSL_OU="Organizational Unit"
   OPENSSL_EMAILADDRESS="info@${FQDN}"
 
   # GPG configuration
-  GPG_REAL_NAME='Autogenerated Key'
+  GPG_REAL_NAME="Autogenerated Key"
   # On a REAL install, please do not set a comment, see here for why: https://www.debian-administration.org/users/dkg/weblog/97
-  GPG_COMMENT='WARNING: MISP AutoGenerated Key consider this Key VOID!'
-  GPG_EMAIL_ADDRESS='admin@admin.test'
+  GPG_COMMENT="WARNING: MISP AutoGenerated Key consider this Key VOID!"
+  GPG_EMAIL_ADDRESS="admin@admin.test"
   # 3072 bits used as per suggestions here: https://riseup.net/en/security/message-security/openpgp/best-practices
-  GPG_KEY_LENGTH='3072'
+  GPG_KEY_LENGTH="3072"
   GPG_PASSPHRASE="$(openssl rand -hex 32)"
 
   # debug alias to make sure people are not confused when blindly copy pasting blobs of code
@@ -78,10 +78,10 @@ MISPvars () {
   alias checkAptLock="echo 'Function used in Installer to make sure apt is not locked'"
 
   # php.ini configuration
-  upload_max_filesize=50M
-  post_max_size=50M
-  max_execution_time=300
-  memory_limit=2048M
+  upload_max_filesize="50M"
+  post_max_size="50M"
+  max_execution_time="300"
+  memory_limit="2048M"
 
   CAKE="${PATH_TO_MISP}/app/Console/cake"