Merge branch 'master' of github.com:serghey-rodin/vesta

Author: very-twi

bin/v_add_db_host

@@ -60,7 +60,7 @@ case $type in
             new_str="$new_str MAX_DB='$max_db' U_SYS_USERS=''";
             new_str="$new_str U_DB_BASES='0'  ACTIVE='yes' DATE='$V_DATE'";;
     pgsql) new_str="HOST='$host' USER='$db_user' PASSWORD='$db_password'";
-            new_str="$new_str PORT='$port' TPL='$tpl'";
+            new_str="$new_str PORT='$port' TPL='$template'";
             new_str="$new_str MAX_USERS='$max_usr' MAX_DB='$max_db'";
             new_str="$new_str U_SYS_USERS=''";
             new_str="$new_str U_DB_BASES='0' ACTIVE='yes' DATE='$V_DATE'";;

bin/v_add_sys_cron

@@ -59,7 +59,7 @@ v_str="JOB='$job' MIN='$min' HOUR='$hour' DAY='$day' MONTH='$month"
 v_str="$v_str' WDAY='$wday' CMD='$command' SUSPEND='no' DATE='$V_DATE'"
 
 # Adding to crontab
-echo "$v_str">>$V_USERS/$user/crontab.conf
+echo "$v_str">>$V_USERS/$user/cron.conf
 
 # Sorting jobs by id
 sort_cron_jobs

bin/v_add_sys_user

@@ -118,7 +118,7 @@ echo "v_upd_sys_user_disk $user" >> $V_QUEUE/disk.pipe
 
 if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
     mkdir $V_USERS/$user/cert
-    touch $V_USERS/$user/web_domains.conf
+    touch $V_USERS/$user/web.conf
     echo "v_upd_web_domains_traff $user" >> $V_QUEUE/traffic.pipe
     echo "v_upd_web_domains_disk $user" >> $V_QUEUE/disk.pipe
 fi
@@ -140,7 +140,7 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then
 fi
 
 if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then
-    touch $V_USERS/$user/crontab.conf
+    touch $V_USERS/$user/cron.conf
 fi
 
 if [ ! -z "$BACKUP_SYSTEM" ] && [ "$BACKUP_SYSTEM" != 'no' ]; then

bin/v_add_web_domain

@@ -183,11 +183,11 @@ v_str="$v_str TPL='$template'"
 v_str="$v_str ALIAS='$aliases'"
 v_str="$v_str $template_data"    # Inserting PHP,CGI and ELOG keys
 v_str="$v_str STATS='' STATS_AUTH=''"
-v_str="$v_str SSL='no' SSL_HOME='' SSL_CERT=''"
+v_str="$v_str SSL_HOME='' SSL_CERT=''"
 v_str="$v_str NGINX='' NGINX_EXT='' SUSPEND='no' DATE='$V_DATE'"
 
 # Registering domain
-echo "$v_str" >>$V_USERS/$user/web_domains.conf
+echo "$v_str" >>$V_USERS/$user/web.conf
 
 # Adding task to the vesta pipe
 restart_schedule 'web'