From a2954d3731d2423897d3fe32265fd6b0af324938 Mon Sep 17 00:00:00 2001 From: myvesta <38690722+myvesta@users.noreply.github.com> Date: Sat, 15 Aug 2020 22:46:18 +0200 Subject: [PATCH] Automatically call v-make-separated-ip-for-email from v-make-separated-ip-for-email-domain --- bin/v-make-separated-ip-for-email-domain | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bin/v-make-separated-ip-for-email-domain b/bin/v-make-separated-ip-for-email-domain index 769139b5..f4b129e1 100644 --- a/bin/v-make-separated-ip-for-email-domain +++ b/bin/v-make-separated-ip-for-email-domain @@ -33,8 +33,7 @@ is_domain_format_valid "$DOMAIN" is_ip_format_valid "$IP" if [ ! -d "/etc/exim4/virtual" ]; then - echo "You must first dedicate IP to some hostname using command v-make-separated-ip-for-email" - exit 1 + /usr/local/vesta/bin/v-make-separated-ip-for-email "$DOMAIN" "$IP" fi HOST_USER=$($VESTA/bin/v-search-domain-owner "$HOSTNAME") @@ -50,8 +49,7 @@ HOST_IP=$($VESTA/bin/v-list-web-domain "$HOST_USER" "$HOSTNAME" | grep 'IP:' | a check_grep=$(grep -c "^$IP:" /etc/exim4/virtual/helo_data) if [ "$check_grep" -eq 0 ]; then - echo "You must first dedicate IP to some hostname using command v-make-separated-ip-for-email" - exit 3 + /usr/local/vesta/bin/v-make-separated-ip-for-email "$DOMAIN" "$IP" fi USER=$($VESTA/bin/v-search-domain-owner "$DOMAIN")