fix for caching template

Author: serghey-rodin

bin/v-add-web-domain

@@ -188,8 +188,8 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
     if [ -z "$(grep "$conf" $proxy_conf)" ]; then
         echo "include $conf;" >> $proxy_conf
     fi
-    if [ -x $WEBTPL/$PROXY_SYSTEM/$template.sh ]; then
-        $WEBTPL/$PROXY_SYSTEM/$template.sh $user $domain $ip $HOMEDIR $docroot
+    if [ -x $WEBTPL/$PROXY_SYSTEM/$proxy.sh ]; then
+        $WEBTPL/$PROXY_SYSTEM/$proxy.sh $user $domain $ip $HOMEDIR $docroot
     fi
 fi
 

bin/v-backup-user

@@ -227,7 +227,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
 
         # Backup files
         cd $HOMEDIR/$user/web/$domain
-        find . ${fargs[@]} -type f -print0 |\
+        find . ${fargs[@]} -type f -or -type l -print0 |\
             tar -cpf $tmpdir/web/$domain/domain_data.tar --null -T -
 
         # Backup empty folders
@@ -490,7 +490,7 @@ if [ "$USER" != '*' ]; then
     IFS=$'\n'
     set -f
     i=0
-    for udir in $(ls |egrep -v "conf|web|dns|mail"); do
+    for udir in $(ls -a |egrep -v "conf|web|dns|mail|^\.\.$|^\.$"); do
         check_exl=$(echo -e "${USER//,/\n}" |grep "^$udir$")
         if [ -z "$check_exl" ]; then
             ((i ++))
@@ -499,7 +499,7 @@ if [ "$USER" != '*' ]; then
             msg="$msg\n$(date "+%F %T") adding directory $udir"
 
             # Backup files
-            find ./$udir ${fargs[@]} -type f -print0 |\
+            find ./$udir ${fargs[@]} -type f -or -type l -print0 |\
                 tar -cpf $tmpdir/user_dir/$udir.tar --null -T -
 
             # Backup empty folders

func/domain.sh

@@ -11,11 +11,11 @@ is_web_template_valid() {
 
 # Proxy template check
 is_proxy_template_valid() {
-    template=$1
-    t="$WEBTPL/$PROXY_SYSTEM/$template.tpl"
-    s="$WEBTPL/$PROXY_SYSTEM/$template.stpl"
+    proxy=$1
+    t="$WEBTPL/$PROXY_SYSTEM/$proxy.tpl"
+    s="$WEBTPL/$PROXY_SYSTEM/$proxy.stpl"
     if [ ! -e $t ] || [ ! -e $s ]; then
-        echo "Error: proxy template $template not found"
+        echo "Error: proxy template $proxy not found"
         log_event "$E_NOTEXIST" "$EVENT"
         exit $E_NOTEXIST
     fi