From 10a44aad0788199b21790079b67a99a9f79a7947 Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Thu, 27 Aug 2020 09:22:51 +0900 Subject: [PATCH] chg: [installer] Made the globalVariables more flexible when you need to override them --- docs/generic/globalVariables.md | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/docs/generic/globalVariables.md b/docs/generic/globalVariables.md index 8a451317e..8d8ecad57 100644 --- a/docs/generic/globalVariables.md +++ b/docs/generic/globalVariables.md @@ -7,12 +7,9 @@ MISPvars () { debug "Setting generic ${LBLUE}MISP${NC} variables shared by all flavours" 2> /dev/null # Local non-root MISP user - MISP_USER='misp' + MISP_USER="${MISP_USER:-misp}" MISP_PASSWORD="$(openssl rand -hex 32)" - # MISP configuration variables - PATH_TO_MISP='/var/www/MISP' - # The web server user # RHEL/CentOS if [[ -f "/etc/redhat-release" ]]; then @@ -25,13 +22,13 @@ MISPvars () { # OpenBSD elif [[ "$(uname -s)" == "OpenBSD" ]]; then WWW_USER="www" - PATH_TO_MISP="/var/www/htdocs/MISP" + PATH_TO_MISP="${PATH_TO_MISP:-/var/www/htdocs/MISP}" SUDO_WWW="doas -u www " SUDO_CMD="doas " # NetBSD elif [[ "$(uname -s)" == "NetBSD" ]]; then WWW_USER="www" - PATH_TO_MISP="/usr/pkg/share/httpd/htdocs/MISP" + PATH_TO_MISP="$PATH_TO_MISP:-/usr/pkg/share/httpd/htdocs/MISP}" SUDO_WWW="sudo -H -u ${WWW_USER} " else # I am feeling lucky @@ -39,13 +36,12 @@ MISPvars () { SUDO_WWW="sudo -H -u ${WWW_USER} " fi - if [ -z "${FQDN}" ]; then - FQDN="misp.local" - fi + # MISP configuration variables + PATH_TO_MISP="${PATH_TO_MISP:-/var/www/MISP}" - if [ -z "${MISP_BASEURL}" ]; then - MISP_BASEURL='""' - fi + FQDN="${FQDN:-misp.local}" + + MISP_BASEURL="${MISP_BASEURL:-""}" MISP_LIVE='1'