From cf49a6cc46b1293f4ddb9ecb88e0894fd0e80b85 Mon Sep 17 00:00:00 2001
From: "vadim s. sabinich" <1430016+sabinich@users.noreply.github.com>
Date: Fri, 30 Nov 2018 12:36:07 +0800
Subject: [PATCH] Update v-add-sys-ip
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Добавил проверку наличия Listen 127.0.0.1:<PORT>. Если запись есть, то ничего не добавляется.
---
 bin/v-add-sys-ip | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/bin/v-add-sys-ip b/bin/v-add-sys-ip
index dc65e0300..b055b2413 100755
--- a/bin/v-add-sys-ip
+++ b/bin/v-add-sys-ip
@@ -107,17 +107,21 @@ if [ ! -z "$WEB_SYSTEM" ]; then
     rm -f $web_conf
 
     if [ "$WEB_SYSTEM" = 'httpd' ] || [ "$WEB_SYSTEM" = 'apache2' ]; then
-        if [ -z "$(/usr/sbin/apachectl -v | grep Apache/2.4)" ]; then
-            echo "NameVirtualHost $ip:$WEB_PORT" >  $web_conf
+        if [ -z "$(grep -r "Listen 127.0.0.1:$WEB_PORT" /etc/httpd/conf.d/* )" ]; then
+            if [ -z "$(/usr/sbin/apachectl -v | grep Apache/2.4)" ]; then
+                echo "NameVirtualHost $ip:$WEB_PORT" >  $web_conf
+            fi
+            echo "Listen 127.0.0.1:$WEB_PORT" >> $web_conf
         fi
-        echo "Listen 127.0.0.1:$WEB_PORT" >> $web_conf
-    fi
+   fi
 
     if [ "$WEB_SSL" = 'mod_ssl' ]; then
-        if [ -z "$(/usr/sbin/apachectl -v | grep Apache/2.4)" ]; then
-            echo "NameVirtualHost $ip:$WEB_SSL_PORT" >> $web_conf
+        if [ -z "$(grep -r "Listen 127.0.0.1:$WEB_PORT" /etc/httpd/conf.d/* )" ]; then
+            if [ -z "$(/usr/sbin/apachectl -v | grep Apache/2.4)" ]; then
+                echo "NameVirtualHost $ip:$WEB_SSL_PORT" >> $web_conf
+            fi
+            echo "Listen 127.0.0.1:$WEB_SSL_PORT" >> $web_conf
         fi
-        echo "Listen 127.0.0.1:$WEB_SSL_PORT" >> $web_conf
     fi
 fi