external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-04 00:17:06 +00:00
Code Issues Releases Wiki Activity

Use an explicit php exectable and package if specified by environment variables

Browse Source
This commit is contained in:
downtownallday 2022-10-13 09:27:58 -04:00
parent f38e275734
commit 9b62b5dc1a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
setup/mods.available/connect-nextcloud-to-miab.sh
View File

@ -274,7 +274,7 @@ fi
# #
# get the url used to access nextcloud as NC_ADMIN_USER # get the url used to access nextcloud as NC_ADMIN_USER
# #
NC_CONFIG_CLI_URL="$(cd "$NCDIR/config"; php -n -r 'include "config.php"; print $CONFIG["overwrite.cli.url"];')" NC_CONFIG_CLI_URL="$(cd "$NCDIR/config"; ${REQUIRED_PHP_EXECUTABLE:-php} -n -r 'include "config.php"; print $CONFIG["overwrite.cli.url"];')"
case "$NC_CONFIG_CLI_URL" in case "$NC_CONFIG_CLI_URL" in
http:* | https:* ) http:* | https:* )
urlproto=$(awk -F/ '{print $1}' <<< "$NC_CONFIG_CLI_URL") urlproto=$(awk -F/ '{print $1}' <<< "$NC_CONFIG_CLI_URL")
@ -386,7 +386,7 @@ enable_user_ldap() {
if [ ! -e /etc/apt/preferences.d/no-debian-php ]; then if [ ! -e /etc/apt/preferences.d/no-debian-php ]; then
# on a cloud-in-a-box installation, get the php version that # on a cloud-in-a-box installation, get the php version that
# nextcloud uses, otherwise install the system php # nextcloud uses, otherwise install the system php
local php="php" local php="${REQUIRED_PHP_PACKAGE:-php}"
local ciab_site_conf="/etc/nginx/sites-enabled/cloudinabox-nextcloud" local ciab_site_conf="/etc/nginx/sites-enabled/cloudinabox-nextcloud"
if [ -e "$ciab_site_conf" ]; then if [ -e "$ciab_site_conf" ]; then
php=$(grep 'php[0-9].[0-9]-fpm.sock' "$ciab_site_conf" | \ php=$(grep 'php[0-9].[0-9]-fpm.sock' "$ciab_site_conf" | \
@ -395,7 +395,7 @@ enable_user_ldap() {
sed 's/-fpm.*$//') sed 's/-fpm.*$//')
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
say "Warning: this looks like a Cloud-In-A-Box system, but detecting the php version used by Nextcloud failed. Using the system php-ldap module..." say "Warning: this looks like a Cloud-In-A-Box system, but detecting the php version used by Nextcloud failed. Using the system php-ldap module..."
php="php" php="${REQUIRED_PHP_PACKAGE:-php}"
fi fi
fi fi
say_verbose "Installing system package $php-ldap" say_verbose "Installing system package $php-ldap"
@ -408,7 +408,7 @@ enable_user_ldap() {
say "WARNING: sudo is not installed: Unable to run occ to check and/or enable Nextcloud app \"user-ldap\"." say "WARNING: sudo is not installed: Unable to run occ to check and/or enable Nextcloud app \"user-ldap\"."
else else
say_verbose "Enable user-ldap" say_verbose "Enable user-ldap"
sudo -E -u www-data php $NCDIR/occ app:enable user_ldap -q sudo -E -u www-data ${REQUIRED_PHP_EXECUTABLE:-php} $NCDIR/occ app:enable user_ldap -q
[ $? -ne 0 ] && die "Unable to enable user_ldap nextcloud app" [ $? -ne 0 ] && die "Unable to enable user_ldap nextcloud app"
fi fi
} }
@ -418,9 +418,9 @@ install_app() {
if [ ! -x /usr/bin/sudo ]; then if [ ! -x /usr/bin/sudo ]; then
say "WARNING: sudo is not installed: Unable to run occ to check and/or install Nextcloud app \"$app\"." say "WARNING: sudo is not installed: Unable to run occ to check and/or install Nextcloud app \"$app\"."
elif [ -z "$(sudo -E -u www-data php $NCDIR/occ app:list | grep -F "${app}:")" ]; then elif [ -z "$(sudo -E -u www-data ${REQUIRED_PHP_EXECUTABLE:-php} $NCDIR/occ app:list | grep -F "${app}:")" ]; then
say_verbose "Install app '$app'" say_verbose "Install app '$app'"
sudo -E -u www-data php $NCDIR/occ app:install $app sudo -E -u www-data ${REQUIRED_PHP_EXECUTABLE:-php} $NCDIR/occ app:install $app
[ $? -ne 0 ] && die "Unable to install Nextcloud app '$app'" [ $? -ne 0 ] && die "Unable to install Nextcloud app '$app'"
fi fi
} }