Add snippet 'get-path-of-php-command.sh' and change concerning code..
This commit is contained in:
@ -216,13 +216,38 @@ if [[ -z "$WEBSITE" ]] ; then
|
||||
|
||||
fi
|
||||
|
||||
WEB_BASE_DIR="/var/www/${WEBSITE}"
|
||||
|
||||
# - Reset IFS
|
||||
# -
|
||||
IFS=$CUR_IFS
|
||||
|
||||
DEFAULT_SRC_BASE_DIR="/usr/local/src/nextcloud"
|
||||
DEFAULT_HTTP_USER="www-data"
|
||||
DEFAULT_HTTP_GROUP="www-data"
|
||||
DEFAULT_PHP_ENGINE='FPM'
|
||||
|
||||
echo ""
|
||||
echononl " Include Configuration file.."
|
||||
if [[ ! -f $conf_file ]]; then
|
||||
echo_failed
|
||||
fatal "Missing configuration file '$conf_file'."
|
||||
else
|
||||
source $conf_file
|
||||
echo_ok
|
||||
fi
|
||||
echo ""
|
||||
|
||||
DEFAULT_WEB_BASE_DIR="/var/www/${WEBSITE}"
|
||||
[[ -n "$WEB_BASE_DIR" ]] || WEB_BASE_DIR=$DEFAULT_WEB_BASE_DIR
|
||||
|
||||
if [[ ! -d ${WEB_BASE_DIR} ]] ; then
|
||||
fatal "Web base directory '$WEB_BASE_DIR' not found!"
|
||||
fi
|
||||
|
||||
DATA_DIR="$(realpath ${WEB_BASE_DIR}/data)"
|
||||
|
||||
[[ -n "$PHP_ENGINE" ]] || PHP_ENGINE=$DEFAULT_PHP_ENGINE
|
||||
|
||||
INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)"
|
||||
CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
|
||||
|
||||
@ -275,11 +300,15 @@ APACHE2_IS_ENABLED=false
|
||||
source ${snippet_dir}/get-webservice-environment.sh
|
||||
|
||||
|
||||
if [[ -x "$(realpath /usr/local/php/bin/php)" ]]; then
|
||||
PHP_BIN="/usr/local/php/bin/php"
|
||||
else
|
||||
PHP_BIN="$(which php)"
|
||||
fi
|
||||
# Check PHP Version
|
||||
#
|
||||
source ${snippet_dir}/get-php-major-version.sh
|
||||
|
||||
|
||||
# Get full qualified PHP command
|
||||
#
|
||||
source ${snippet_dir}/get-path-of-php-command.sh
|
||||
|
||||
|
||||
if [[ ! -x "$PHP_BIN" ]]; then
|
||||
fatal "No PHP binary found!"
|
||||
|
Reference in New Issue
Block a user