From 17c20881e13155c6cfe5eef4c62f2cdfaa4beefb Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Tue, 28 Jun 2016 02:46:10 +0300
Subject: [PATCH] autoupdates + fqdn workaround

---
 install/vst-install-debian.sh | 10 ++++++++++
 install/vst-install-rhel.sh   | 10 ++++++++++
 install/vst-install-ubuntu.sh | 10 ++++++++++
 3 files changed, 30 insertions(+)

diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh
index 40be39ef6..dd12e94da 100755
--- a/install/vst-install-debian.sh
+++ b/install/vst-install-debian.sh
@@ -380,6 +380,13 @@ if [ -z "$servername" ]; then
     servername=$(hostname -f)
 fi
 
+# Set FQND if it wasn't set
+mask1='(([[:alnum:]](-?[[:alnum:]])*)\.)'
+mask2='*[[:alnum:]](-?[[:alnum:]])+\.[[:alnum:]]{2,}'
+if ! [[ "$servername" =~ ^${mask1}${mask2}$ ]]; then
+    servername="$servername.example.com"
+fi
+
 # Set email if it wasn't set
 if [ -z "$email" ]; then
     email="admin@$servername"
@@ -1182,6 +1189,9 @@ check_result $? "vesta start failed"
 # Adding notifications
 $VESTA/upd/add_notifications.sh
 
+# Adding cronjob for autoupdates
+$VESTA/bin/v-add-cron-vesta-autoupdate
+
 
 #----------------------------------------------------------#
 #                   Vesta Access Info                      #
diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh
index 058317f37..9679ddf92 100755
--- a/install/vst-install-rhel.sh
+++ b/install/vst-install-rhel.sh
@@ -380,6 +380,13 @@ if [ -z "$servername" ]; then
     servername=$(hostname -f)
 fi
 
+# Set FQND if it wasn't set
+mask1='(([[:alnum:]](-?[[:alnum:]])*)\.)'
+mask2='*[[:alnum:]](-?[[:alnum:]])+\.[[:alnum:]]{2,}'
+if ! [[ "$servername" =~ ^${mask1}${mask2}$ ]]; then
+    servername="$servername.example.com"
+fi
+
 # Set email if it wasn't set
 if [ -z "$email" ]; then
     email="admin@$servername"
@@ -1252,6 +1259,9 @@ check_result $? "vesta start failed"
 # Adding notifications
 $VESTA/upd/add_notifications.sh
 
+# Adding cronjob for autoupdates
+$VESTA/bin/v-add-cron-vesta-autoupdate
+
 
 #----------------------------------------------------------#
 #                   Vesta Access Info                      #
diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh
index a04736103..1ea333210 100755
--- a/install/vst-install-ubuntu.sh
+++ b/install/vst-install-ubuntu.sh
@@ -365,6 +365,13 @@ if [ -z "$servername" ]; then
     servername=$(hostname -f)
 fi
 
+# Set FQND if it wasn't set
+mask1='(([[:alnum:]](-?[[:alnum:]])*)\.)'
+mask2='*[[:alnum:]](-?[[:alnum:]])+\.[[:alnum:]]{2,}'
+if ! [[ "$servername" =~ ^${mask1}${mask2}$ ]]; then
+    servername="$servername.example.com"
+fi
+
 # Set email if it wasn't set
 if [ -z "$email" ]; then
     email="admin@$servername"
@@ -1171,6 +1178,9 @@ check_result $? "vesta start failed"
 # Adding notifications
 $VESTA/upd/add_notifications.sh
 
+# Adding cronjob for autoupdates
+$VESTA/bin/v-add-cron-vesta-autoupdate
+
 
 #----------------------------------------------------------#
 #                   Vesta Access Info                      #