From 689c5e58f88410d97d7e5505a484481a2560dd93 Mon Sep 17 00:00:00 2001
From: Ilia Rostovtsev <ilia@rostovtsev.io>
Date: Sat, 13 Mar 2021 16:37:59 +0300
Subject: [PATCH] Fix listen mode logic

---
 config                                 | 2 +-
 config-CentOS-Linux-7.0-ALL            | 2 +-
 config-Redhat-Enterprise-Linux-7.0-ALL | 2 +-
 config-Scientific-Linux-7.0-ALL        | 2 +-
 config-debian-linux                    | 2 +-
 config-redhat-linux                    | 2 +-
 virtual_feature.pl                     | 6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config b/config
index dc514e0..f53e3b4 100644
--- a/config
+++ b/config
@@ -5,5 +5,5 @@ stop_cmd=killall nginx
 apply_cmd=killall nginx ; sleep 1 ; /usr/local/nginx/sbin/nginx >/dev/null 2>&1 </dev/null &
 child_procs=4
 php_socket=1
-listen_mode=0
+listen_mode=1
 http2=0
diff --git a/config-CentOS-Linux-7.0-ALL b/config-CentOS-Linux-7.0-ALL
index daa9206..bd7f62c 100644
--- a/config-CentOS-Linux-7.0-ALL
+++ b/config-CentOS-Linux-7.0-ALL
@@ -5,5 +5,5 @@ stop_cmd=systemctl stop nginx
 apply_cmd=systemctl restart nginx
 child_procs=4
 php_socket=1
-listen_mode=0
+listen_mode=1
 http2=0
diff --git a/config-Redhat-Enterprise-Linux-7.0-ALL b/config-Redhat-Enterprise-Linux-7.0-ALL
index 5615707..7845ce1 100644
--- a/config-Redhat-Enterprise-Linux-7.0-ALL
+++ b/config-Redhat-Enterprise-Linux-7.0-ALL
@@ -5,5 +5,5 @@ stop_cmd=service nginx stop
 apply_cmd=service nginx restart
 child_procs=4
 php_socket=1
-listen_mode=0
+listen_mode=1
 http2=0
diff --git a/config-Scientific-Linux-7.0-ALL b/config-Scientific-Linux-7.0-ALL
index 5615707..7845ce1 100644
--- a/config-Scientific-Linux-7.0-ALL
+++ b/config-Scientific-Linux-7.0-ALL
@@ -5,5 +5,5 @@ stop_cmd=service nginx stop
 apply_cmd=service nginx restart
 child_procs=4
 php_socket=1
-listen_mode=0
+listen_mode=1
 http2=0
diff --git a/config-debian-linux b/config-debian-linux
index 80fd199..023a599 100644
--- a/config-debian-linux
+++ b/config-debian-linux
@@ -7,5 +7,5 @@ add_to=/etc/nginx/sites-available
 add_link=/etc/nginx/sites-enabled
 child_procs=4
 php_socket=1
-listen_mode=0
+listen_mode=1
 http2=0
diff --git a/config-redhat-linux b/config-redhat-linux
index 3e8bb5a..330f8aa 100644
--- a/config-redhat-linux
+++ b/config-redhat-linux
@@ -5,5 +5,5 @@ stop_cmd=/etc/init.d/nginx stop
 apply_cmd=/etc/init.d/nginx restart
 child_procs=4
 php_socket=1
-listen_mode=0
+listen_mode=1
 http2=0
diff --git a/virtual_feature.pl b/virtual_feature.pl
index 59c8cf0..b749bfc 100644
--- a/virtual_feature.pl
+++ b/virtual_feature.pl
@@ -156,7 +156,7 @@ sub feature_setup
 		  'words' => [ &domain_server_names($d) ] });
 
 	# Add listen on the correct IP and port
-	if ($config{'listen_mode'}) {
+	if ($config{'listen_mode'} eq '0') {
 		# Just use port numbers
 		push(@{$server->{'members'}},
 			{ 'name' => 'listen',
@@ -892,7 +892,7 @@ sub feature_validate
 			      $d->{'web_port'} == 80 ||
 			     $l =~ /^\Q$d->{'ip'}\E:(\d+)$/ &&
 			      $d->{'web_port'} == $1);
-		$found++ if ($l eq $d->{'web_port'} && $config{'listen_mode'});
+		$found++ if ($l eq $d->{'web_port'} && $config{'listen_mode'} eq '0');
 		}
 	$found || return &text('feat_evalidateip',
 			       $d->{'ip'}, $d->{'web_port'});
@@ -904,7 +904,7 @@ sub feature_validate
 				      $l =~ /^\[\Q$d->{'ip6'}\E\]:(\d+)$/ &&
 				       $d->{'web_port'} == $1);
 			$found6++ if ($l eq $d->{'web_port'} &&
-				      $config{'listen_mode'});
+				      $config{'listen_mode'} eq '0');
 			}
 		$found6 || return &text('feat_evalidateip6',
 					$d->{'ip6'}, $d->{'web_port'});