Skip to content

Commit 1dcc0a2

Browse files
committed
multiphp upgrade script was updating only nginx web templates
1 parent 2102180 commit 1dcc0a2

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

install/upgrade/manual/migrate-190718-multiphp.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,11 @@ source $HESTIA/conf/hestia.conf
2929

3030
DEFAULT_BTPL="PHP-7_3"
3131
num_php_versions=$(ls -d /etc/php/*/fpm/pool.d 2>/dev/null |wc -l)
32-
echo $num_php_versions
32+
echo "Found $num_php_versions php versions"
3333

3434
if [ "$num_php_versions" -gt 1 ] && [ -z "$WEB_BACKEND" ]; then
3535
# Legacy multiphp
3636

37-
echo $num_php_versions
3837
sed -i "/^WEB_BACKEND=/d" $HESTIA/conf/hestia.conf
3938
echo "WEB_BACKEND='php-fpm'" >> $HESTIA/conf/hestia.conf
4039

@@ -43,8 +42,8 @@ if [ "$num_php_versions" -gt 1 ] && [ -z "$WEB_BACKEND" ]; then
4342
cp -f "$HESTIA_INSTALL_DIR/php-fpm/multiphp.tpl" ${WEBTPL}/php-fpm/PHP-${php_ver/\./_}.tpl
4443
done
4544

46-
if [ "$WEB_SYSTEM" = 'nginx' ]; then
47-
cp -rf "${HESTIA_INSTALL_DIR}/templates/web/nginx" "${WEBTPL}/"
45+
if [ ! -z "$WEB_SYSTEM" ]; then
46+
cp -rf "${HESTIA_INSTALL_DIR}/templates/web/$WEB_SYSTEM" "${WEBTPL}/"
4847
fi
4948

5049
# Migrate domains

0 commit comments

Comments
 (0)