From 56676aec2a8cc6c7678245bcb2e6a730cbb04b30 Mon Sep 17 00:00:00 2001 From: "vadim s. sabinich" <1430016+sabinich@users.noreply.github.com> Date: Thu, 29 Nov 2018 13:11:46 +0800 Subject: [PATCH] Update v-add-sys-ip MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit В скрипте указывается как "имя IP", в веб-интерфейсе Весты как "Домен". Но нигде не используется. Предполагаю заменить на использование в качестве доменного имени по умолчанию. --- bin/v-add-sys-ip | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/v-add-sys-ip b/bin/v-add-sys-ip index 2b43aaa07..5f2a1a3bd 100755 --- a/bin/v-add-sys-ip +++ b/bin/v-add-sys-ip @@ -1,6 +1,6 @@ #!/bin/bash # info: add system ip address -# options: IP NETMASK [INTERFACE] [USER] [IP_STATUS] [IP_NAME] [NAT_IP] +# options: IP NETMASK [INTERFACE] [USER] [IP_STATUS] [DEFAULT_DOMAIN] [NAT_IP] # # The function adds ip address into a system. It also creates rc scripts. You # can specify ip name which will be used as root domain for temporary aliases. @@ -34,7 +34,7 @@ source $VESTA/conf/vesta.conf # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'IP NETMASK [INTERFACE] [USER] [STATUS] [NAME] [NATED_IP]' +check_args '2' "$#" 'IP NETMASK [INTERFACE] [USER] [STATUS] [DEFAULT_DOMAIN] [NATED_IP]' is_format_valid 'ip' 'netmask' 'interface' 'user' 'ip_status' is_ip_free is_object_valid 'user' 'USER' "$user" @@ -90,7 +90,7 @@ date=$(echo "$time_n_date" |cut -f 2 -d \ ) # Adding vesta ip echo "OWNER='$user' STATUS='$ip_status' -NAME='$ip_name' +DEFAULT_DOMAIN='$ip_name' U_SYS_USERS='' U_WEB_DOMAINS='0' INTERFACE='$interface'