Increment backend port also when commented

[henri-hulski]

This allows to grep the incremented port also for other backends then php-fpm with %backend_lsnr% in the web template.

This is an example how I use it in a wsgi app with gunicorn. It works out of the box with this patch applied.

Backend template:

;[%backend%]
;listen = 127.0.0.1:%backend_port%

Nginx web template:

server {
    listen      %ip%:%web_ssl_port% ssl http2;
    server_name %domain_idn% %alias_idn%;

    location / {
        proxy_pass          http://%backend_lsnr%/;
        proxy_redirect      off;
        proxy_set_header    Host                    $host;
        proxy_set_header    X-Real-IP               $remote_addr;
        proxy_set_header    X-Forwarded-For         $proxy_add_x_forwarded_for;
        proxy_set_header    X-Forwarded-Protocol    $scheme;
    }
}

[jaapmarcus]

See comments if not the default template is used it seems to fail loading properly

[jaapmarcus]

If I rebuild a domain with PHP-7_4 template for example it runs:
pool="/etc/php/7.4/fpm/pool.d"
grep $pool/* 2> /dev/null | grep -o :[0-9].*

And it freezes

[henri-hulski]

Strange. I made the same PR to Vesta in December 2018. It was excepted in October 2021 and is still the newest change to both files.

outroll/vesta#1791

[henri-hulski]

I tested it when I made it the first time but maybe something has changed.

[jaapmarcus]

hestiacp/func/domain.sh

Lines 102 to 131 in 559aece

	# Accept first function argument as backend template otherwise fallback to $template global variable
	local backend_template=${1:-$template}
	pool=$(find -L /etc/php/ -name "$domain.conf" -exec dirname {} \;)
	# Check if multiple-PHP installed
	regex="socket-(\d+)_(\d+)"
	if [[ $backend_template =~ ^.*PHP-([0-9])\_([0-9])$ ]]; then
	backend_version="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}"
	pool=$(find -L /etc/php/$backend_version -type d \( -name "pool.d" -o -name "*fpm.d" \))
	else
	backend_version=$(multiphp_default_version)
	if [ -z "$pool" ] || [ -z "$BACKEND" ]; then
	pool=$(find -L /etc/php/$backend_version -type d \( -name "pool.d" -o -name "*fpm.d" \))
	fi
	fi
	if [ ! -e "$pool" ]; then
	check_result $E_NOTEXIST "php-fpm pool doesn't exist"
	fi
	backend_type="$domain"
	if [ "$WEB_BACKEND_POOL" = 'user' ]; then
	backend_type="$user"
	fi
	if [ -e "$pool/$backend_type.conf" ]; then
	backend_lsnr=$(grep "listen =" $pool/$backend_type.conf)
	backend_lsnr=$(echo "$backend_lsnr" | cut -f 2 -d = | sed "s/ //")
	if [ -n "$(echo $backend_lsnr | grep /)" ]; then
	backend_lsnr="unix:$backend_lsnr"
	fi
	fi

vs

https://github.com/serghey-rodin/vesta/blob/bba7400b8a01d462dae4b2f805866c2ac5efbf00/func/domain.sh#L85-L103

It looks like we have made some changes to it it might be the reason why it breaks

[jaapmarcus]

It looks like as VestaCP doesn't support multiple fpm version is caused the issue

Replacing your line with

ports=$(grep listen /etc/php/*/fpm/pool.d/* | grep -o :[0-9].*)

Seems to work. But how do we provide the port number back to the user.

it would be easier to supply the user with a option to spefiy the port via web domain selection

[jaapmarcus]

Same here

[jaapmarcus]

See last comment accidentally approved it