Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typo, do not reinstall php if wo release >=3.9.5

Browse Source
This commit is contained in:
VirtuBox
2019-06-17 11:39:55 +02:00
parent 7da9acbf72
commit a9a2825a72
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
install
View File

@@ -254,7 +254,7 @@ wo_sync_db() {
wo_site_current_type=$(grep "common/" /etc/nginx/sites-available/$site | awk -F "/" '{print $2}') wo_site_current_type=$(grep "common/" /etc/nginx/sites-available/$site | awk -F "/" '{print $2}')
if [ "$(echo $wo_site_current_type | grep php)" ]; then if [ -n "$(echo $wo_site_current_type | grep php)" ]; then
if [ "$(echo $wo_site_current_type | grep php7)" ]; then if [ "$(echo $wo_site_current_type | grep php7)" ]; then
wo_php_version="7.0" wo_php_version="7.0"
else else
@@ -488,17 +488,19 @@ wo_upgrade_nginx() {
if [ -d /etc/nginx ]; then if [ -d /etc/nginx ]; then
rm -rf /etc/nginx rm -rf /etc/nginx
fi fi
# remove previous php-fpm pool configuration if [ -z "$(/usr/local/bin/wo -v | grep 3.9.5)" ]; then
if [ -n "$CHECK_PHP72" ]; then # remove previous php-fpm pool configuration
apt-get remove php7.2-fpm -y -qq --purge if [ -n "$CHECK_PHP72" ]; then
rm -f /etc/php/7.2/fpm/pool.d/{www.conf,www-two.conf,debug.conf} apt-get remove php7.2-fpm -y -qq --purge
fi rm -f /etc/php/7.2/fpm/pool.d/{www.conf,www-two.conf,debug.conf}
if [ -n "$CHECK_PHP73" ]; then fi
WO_STACK_INSTALL_ARGS="--php73" if [ -n "$CHECK_PHP73" ]; then
apt-get remove php7.3-fpm -y -qq --purge WO_STACK_INSTALL_ARGS="--php73"
rm -f /etc/php/7.3/fpm/pool.d/{www.conf,www-two.conf,debug.conf} apt-get remove php7.3-fpm -y -qq --purge
else rm -f /etc/php/7.3/fpm/pool.d/{www.conf,www-two.conf,debug.conf}
WO WO_STACK_INSTALL_ARGS="" else
WO_STACK_INSTALL_ARGS=""
fi
fi fi
/usr/local/bin/wo stack install --nginx --php "$WO_STACK_INSTALL_ARGS" /usr/local/bin/wo stack install --nginx --php "$WO_STACK_INSTALL_ARGS"
echo "$wo_version_new" > /etc/nginx/common/release echo "$wo_version_new" > /etc/nginx/common/release