From 95a345f2dc19c889982f3b740e0e9727249ebd8e Mon Sep 17 00:00:00 2001 From: Henri Hulski Date: Mon, 17 Dec 2018 19:41:37 +0100 Subject: [PATCH] Increment backend port also when commented This allows to grep the incremented port also for other backends then php-fpm with `%backend_lsnr%` in the web template. --- bin/v-add-web-domain-backend | 2 +- bin/v-change-web-domain-backend-tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/v-add-web-domain-backend b/bin/v-add-web-domain-backend index 44698ffe4..8cafa987f 100755 --- a/bin/v-add-web-domain-backend +++ b/bin/v-add-web-domain-backend @@ -46,7 +46,7 @@ fi # Allocating backend port backend_port=9000 -ports=$(grep -v '^;' $pool/* 2>/dev/null |grep listen |grep -o :[0-9].*) +ports=$(grep listen $pool/* 2>/dev/null |grep -o :[0-9].*) ports=$(echo "$ports" |sed "s/://" |sort -n) for port in $ports; do if [ "$backend_port" -eq "$port" ]; then diff --git a/bin/v-change-web-domain-backend-tpl b/bin/v-change-web-domain-backend-tpl index 62918d094..71dc9fd63 100755 --- a/bin/v-change-web-domain-backend-tpl +++ b/bin/v-change-web-domain-backend-tpl @@ -52,7 +52,7 @@ rm -f $pool/$backend_type.conf # Allocating backend port backend_port=9000 -ports=$(grep -v '^;' $pool/* 2>/dev/null |grep listen |grep -o :[0-9].*) +ports=$(grep listen $pool/* 2>/dev/null |grep -o :[0-9].*) ports=$(echo "$ports" |sed "s/://" |sort -n) for port in $ports; do if [ "$backend_port" -eq "$port" ]; then