Merge remote-tracking branch 'refs/remotes/serghey-rodin/master'

Author: ngocphuongnb

.gitignore

@@ -0,0 +1,3 @@
+*.tar
+*.zip
+*.gzip

LICENSE.txt LICENSELICENSE.txt renamed to LICENSE

@@ -0,0 +1,67 @@
+#!/bin/bash
+# info: activate vesta license
+# options: MODULE LICENSE
+#
+# The function activates and register vesta license
+
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Argument defenition
+module=$(echo $1 | tr '[:lower:]' '[:upper:]')
+license=$2
+
+# Importing system enviroment
+source /etc/profile
+
+# Includes
+source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf
+
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+# Checking arg number
+check_args '2' "$#" 'MODULE LICENSE'
+
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+# Activating license
+v_host='https://vestacp.com/checkout'
+answer=$(curl -s $v_host/activate.php?licence_key=$license&module=$module)
+check_result $? "cant' connect to vestacp.com " $E_CONNECT
+
+# Checking server answer
+if [[ "$answer" != '0' ]]; then
+    echo "Error: $module license $license is invalid"
+    exit $E_INVALID
+fi
+
+
+#----------------------------------------------------------#
+#                       Vesta                              #
+#----------------------------------------------------------#
+
+# Updating vesta.conf
+if [ -z "$(grep "${module}_KEY" $VESTA/conf/vesta.conf)" ]; then
+    echo "${module}_KEY='$license'" >> $VESTA/conf/vesta.conf
+else
+    sed -i "s/${module}_KEY=.*/${module}_KEY='$license'/g" $VESTA/conf/vesta.conf
+fi
+
+# Activating sftpjail
+if [ "$module" = 'SFTPJAIL' ]; then
+    setsid $BIN/v-add-sys-sftp-jail 2>/dev/null
+fi
+
+# Logging
+log_event "$OK" "$EVENT"
+
+exit

bin/v-activate-vesta-license

@@ -1,22 +1,16 @@
 #!/bin/bash
 # info: archive directory
-# options: USER ARCHIVE DIRECTORY [DIRECTORY_N]
+# options: USER ARCHIVE SOURCE
 #
 # The function creates tar archive
 
 user=$1
 archive=$2
-src1=$3
-src2=$4
-src3=$5
-src4=$6
-src5=$7
-src6=$8
-src7=$9
+src=$3
 
 # Checking arguments
-if [ -z "$src1" ]; then
-    echo "Usage: USER ARCHIVE DIRECTORY [DIRECTORY_N]"
+if [ -z "$src" ]; then
+    echo "Usage: USER ARCHIVE SOURCE"
     exit 1
 fi
 
@@ -40,19 +34,22 @@ if [ -e "$archive.tar.gz" ]; then
 fi
 
 # Checking source path
-for src_path in $src1 $src2 $src3 $src4 $src5 $src6 $src7; do
-    rpath=$(readlink -f "$src_path")
-    if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
-        echo "Error: invalid source path $src_path"
-        exit 1
-    fi
-done
+rpath=$(readlink -f "$src")
+if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
+    echo "Error: invalid source path $src"
+    exit 1
+fi
+
+# Parsing current directory
+d=$(dirname "$src")
+
+# Removing leading file path
+f=$(echo "$src" |sed -e "s|$d/||")
 
 # Creating tar.gz archive
-sudo -u $user tar -czf "$archive.tar.gz" \
-    $src1 $src2 $src3 $src4 $src5 $src6 $src7 > /dev/null 2>&1
+sudo -u $user tar -czf "$archive.tar.gz" -C $d $f >/dev/null 2>&1
 if [ "$?" -ne 0 ]; then
-#    echo "Error: archive $archive.tar.gz was not created"
+    echo "Error: archive $archive.tar.gz was not created"
     exit 3
 fi
 

bin/v-add-fs-archive

@@ -44,7 +44,7 @@ remote_dns_health_check
 str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf 2>/dev/null)
 if [ -z "$str" ]; then
     pipe="$VESTA/data/queue/dns-cluster.pipe"
-    queue_str=$(grep -n "$SCRIPT $1 $2 no$" $pipe |cut -f1 -d: |head -n1)
+    queue_str=$(grep -n "$SCRIPT $1 $2 " $pipe |cut -f1 -d: |head -n1)
     if [ ! -z "$queue_str" ]; then
         sed -i "$queue_str d"  $pipe
     fi

bin/v-add-remote-dns-domain

@@ -0,0 +1,57 @@
+#!/bin/bash
+# info: add system firewall
+# opions: NONE
+#
+# The script enables firewall
+
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Includes
+source $VESTA/func/main.sh
+source $VESTA/conf/vesta.conf
+
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+if [ "$FIREWALL_SYSTEM" = 'iptables' ]; then
+    exit
+fi
+
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+# Adding firewall directory
+mkdir -p $VESTA/data/firewall/
+
+# Adding default ruleset
+if [ ! -e "$VESTA/data/firewall/rules.conf" ]; then
+    cp $VESTA/install/rhel/7/* $VESTA/data/firewall/
+fi
+
+# Updating FIREWAL_SYSTEM value
+if [ -z "$(grep FIREWALL_SYSTEM $VESTA/conf/vesta.conf)" ]; then
+    echo "FIREWALL_SYSTEM='iptables'" >> $VESTA/conf/vesta.conf
+else
+    sed -i "s/FIREWALL_SYSTEM.*/FIREWALL_SYSTEM='iptables'/g" \
+        $VESTA/conf/vesta.conf
+fi
+
+# Updating firewall rules
+$BIN/v-update-firewall
+
+
+#----------------------------------------------------------#
+#                       Vesta                              #
+#----------------------------------------------------------#
+
+# Logging
+log_event "$OK" "$EVENT"
+
+exit

bin/v-add-sys-firewall

@@ -75,6 +75,9 @@ if [ ! -z "$WEB_BACKEND" ]; then
     fi
     get_domain_backend_values
     backend=$(get_user_value '$BACKEND_TEMPLATE')
+    if [ -z "$backend" ]; then
+        backend='default'
+    fi
 fi
 
 # Defining variables for add_config function

bin/v-add-web-domain

@@ -13,7 +13,7 @@
 user=$1
 domain=$2
 domain_idn=$(idn -t --quiet -a "$domain")
-template=$3
+template=${3-default}
 
 # Includes
 source $VESTA/func/main.sh

bin/v-add-web-domain-backend

@@ -22,6 +22,8 @@ source $VESTA/conf/vesta.conf
 #                       Action                             #
 #----------------------------------------------------------#
 
+$BIN/v-check-vesta-license >/dev/null
+
 if [ -z "$BACKUP_SYSTEM" ]; then
     exit
 fi

bin/v-backup-users

@@ -5,10 +5,10 @@
 # The function opens/reads files on the file system
 
 user=$1
-src_file=$2
+src=$2
 
 # Checking arguments
-if [ -z "$src_file" ]; then
+if [ -z "$src" ]; then
     echo "Usage: USER FILE"
     exit 1
 fi
@@ -27,27 +27,19 @@ if [ -z $homedir ]; then
 fi
 
 # Checking path
-if [ ! -z "$src_file" ]; then
-    rpath=$(readlink -f "$src_file")
+if [ ! -z "$src" ]; then
+    rpath=$(readlink -f "$src")
     if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
-        echo "Error: invalid source path $src_file"
+        echo "Error: invalid source path $user $src"
         exit 2
     fi
 fi
 
-# Reading file
-#sudo -u $user cat "$src_file" 2>/dev/null
-#if [ $? -ne 0 ]; then
-#    echo "Error: file $src_file was not opened"
-#    exit 3
-#fi
-
 # Checking if file has readable permission
-if [[ ! -r $src_file ]]
-then
-#  echo "File is readable"
-#else
-  echo "Cannot read file"
+sudo -u $user ls "$src" > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+    echo "Error: can't read $src"
+    exit 1
 fi
 
 # Exiting