Skip to content

Commit c64c0e1

Browse files
committed
Fix empty conf error message in pool directory for multiphp.
2 parents 0151b9b + 0151b9b commit c64c0e1

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

install/hst-install-debian.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,6 +1083,8 @@ if [ "$nginx" = 'yes' ]; then
10831083
rm -f /etc/php/$v/fpm/pool.d/*
10841084
v_tpl=$(echo "$v" | sed -e 's/[.]//')
10851085
cp -f $hestiacp/multiphp/nginx/PHP-$v_tpl.* $HESTIA/data/templates/web/nginx/
1086+
cp -f $hestiacp/php-fpm/dummy.conf /etc/php/$v/fpm/pool.d/
1087+
sed -i "/s/9999/9999$v_tpl/g" /etc/php/$v/fpm/pool.d/dummy.conf
10861088
done
10871089
cp -f $hestiacp/php-fpm/www.conf /etc/php/$fpm_v/fpm/pool.d/
10881090
chmod a+x $HESTIA/data/templates/web/nginx/*.sh

install/hst-install-ubuntu.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,6 +1062,8 @@ if [ "$nginx" = 'yes' ]; then
10621062
rm -f /etc/php/$v/fpm/pool.d/*
10631063
v_tpl=$(echo "$v" | sed -e 's/[.]//')
10641064
cp -f $hestiacp/multiphp/nginx/PHP-$v_tpl.* $HESTIA/data/templates/web/nginx/
1065+
cp -f $hestiacp/php-fpm/dummy.conf /etc/php/$v/fpm/pool.d/
1066+
sed -i "/s/9999/9999$v_tpl/g" /etc/php/$v/fpm/pool.d/dummy.conf
10651067
done
10661068
cp -f $hestiacp/php-fpm/www.conf /etc/php/$fpm_v/fpm/pool.d/
10671069
chmod a+x $HESTIA/data/templates/web/nginx/*.sh

install/upgrade/0.9.8-29.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,16 @@ if [ "$PROXY_SYSTEM" = "nginx" ]; then
124124
fi
125125
fi
126126

127+
# Fix empty pool error message for multiphp
128+
php_versions=$( ls -l /etc/php/ | grep ^d | wc -l )
129+
if [ "$php_versions" -gt 1 ]; then
130+
for v in $(ls /etc/php/); do
131+
cp -f $hestiacp/php-fpm/dummy.conf /etc/php/$d/fpm/pool.d/
132+
v=$(echo "$v" | sed -e 's/[.]//')
133+
sed -i "/s/9999/9999$v/g" /etc/php/$v/fpm/pool.d/dummy.conf
134+
done
135+
fi
136+
127137
# Set Purge to false in roundcube config - https://goo.gl/3Nja3u
128138
echo "(*) Updating Roundcube configuration..."
129139
if [ -f /etc/roundcube/config.inc.php ]; then

0 commit comments

Comments
 (0)