Skip to content

Commit c297e33

Browse files
committed
Installer: Allow php-fpm backend on both apache and nginx
1 parent 9d71b58 commit c297e33

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

install/hst-install-debian.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,18 +1004,19 @@ if [ "$apache" = 'no' ] && [ "$nginx" = 'yes' ]; then
10041004
echo "WEB_PORT='80'" >> $HESTIA/conf/hestia.conf
10051005
echo "WEB_SSL_PORT='443'" >> $HESTIA/conf/hestia.conf
10061006
echo "WEB_SSL='openssl'" >> $HESTIA/conf/hestia.conf
1007-
if [ "$release" -ge 9 ] || [ "$multiphp" = 'yes' ]; then
1008-
if [ "$phpfpm" = 'yes' ]; then
1009-
echo "WEB_BACKEND='php-fpm'" >> $HESTIA/conf/hestia.conf
1010-
fi
1011-
else
1012-
if [ "$phpfpm" = 'yes' ]; then
1013-
echo "WEB_BACKEND='php5-fpm'" >> $HESTIA/conf/hestia.conf
1014-
fi
1015-
fi
10161007
echo "STATS_SYSTEM='awstats'" >> $HESTIA/conf/hestia.conf
10171008
fi
10181009

1010+
if [ "$release" -ge 9 ] || [ "$multiphp" = 'yes' ]; then
1011+
if [ "$phpfpm" = 'yes' ]; then
1012+
echo "WEB_BACKEND='php-fpm'" >> $HESTIA/conf/hestia.conf
1013+
fi
1014+
else
1015+
if [ "$phpfpm" = 'yes' ]; then
1016+
echo "WEB_BACKEND='php5-fpm'" >> $HESTIA/conf/hestia.conf
1017+
fi
1018+
fi
1019+
10191020
# FTP stack
10201021
if [ "$vsftpd" = 'yes' ]; then
10211022
echo "FTP_SYSTEM='vsftpd'" >> $HESTIA/conf/hestia.conf

install/hst-install-ubuntu.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -964,12 +964,13 @@ if [ "$apache" = 'no' ] && [ "$nginx" = 'yes' ]; then
964964
echo "WEB_PORT='80'" >> $HESTIA/conf/hestia.conf
965965
echo "WEB_SSL_PORT='443'" >> $HESTIA/conf/hestia.conf
966966
echo "WEB_SSL='openssl'" >> $HESTIA/conf/hestia.conf
967-
if [ "$phpfpm" = 'yes' ] || [ "$multiphp" = 'yes' ]; then
968-
echo "WEB_BACKEND='php-fpm'" >> $HESTIA/conf/hestia.conf
969-
fi
970967
echo "STATS_SYSTEM='awstats'" >> $HESTIA/conf/hestia.conf
971968
fi
972969

970+
if [ "$phpfpm" = 'yes' ] || [ "$multiphp" = 'yes' ]; then
971+
echo "WEB_BACKEND='php-fpm'" >> $HESTIA/conf/hestia.conf
972+
fi
973+
973974
# FTP stack
974975
if [ "$vsftpd" = 'yes' ]; then
975976
echo "FTP_SYSTEM='vsftpd'" >> $HESTIA/conf/hestia.conf

0 commit comments

Comments
 (0)