renamed cert to ssl

Author: serghey-rodin

bin/v_add_sys_user

@@ -103,7 +103,7 @@ touch $V_USERS/$user/user.conf
 echo "v_upd_sys_user_disk $user" >> $V_QUEUE/disk.pipe
 
 if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
-    mkdir $V_USERS/$user/cert
+    mkdir $V_USERS/$user/ssl
     touch $V_USERS/$user/web.conf
     echo "$V_BIN/v_upd_web_domains_traff $user" >> $V_QUEUE/traffic.pipe
     echo "v_upd_web_domains_disk $user" >> $V_QUEUE/disk.pipe

bin/v_add_ssl_certificate bin/v_add_sys_user_sslbin/v_add_ssl_certificate renamed to bin/v_add_sys_user_ssl

@@ -13,14 +13,14 @@ ssl=$2
 source $VESTA/conf/vars.conf
 source $V_CONF/vesta.conf
 source $V_FUNC/shared.func
-source $V_FUNC/cert.func
+source $V_FUNC/ssl.func
 
 #----------------------------------------------------------#
 #                    Verifications                         #
 #----------------------------------------------------------#
 
 # Checking arg number
-check_args '2' "$#" 'user ssl_certificate'
+check_args '2' "$#" 'user ssl'
 
 # Checking argument format
 format_validation 'user' 'ssl'
@@ -43,16 +43,16 @@ is_cert_valid "$V_TMP"
 #----------------------------------------------------------#
 
 # Adding certificate to user dir
-mv $V_TMP/$ssl.crt $V_USERS/$user/cert/
-mv $V_TMP/$ssl.key $V_USERS/$user/cert/
+mv $V_TMP/$ssl.crt $V_USERS/$user/ssl/
+mv $V_TMP/$ssl.key $V_USERS/$user/ssl/
 
 
 #----------------------------------------------------------#
 #                       Vesta                              #
 #----------------------------------------------------------#
 
 # Logging
-log_history "$V_EVENT" "v_del_ssl_certificate $user $ssl"
+log_history "$V_EVENT" "v_del_sys_user_ssl $user $ssl"
 log_event 'system' "$V_EVENT"
 
 exit

bin/v_add_web_domain_ssl

@@ -25,7 +25,7 @@ source $V_FUNC/ip.func
 #----------------------------------------------------------#
 
 # Checking arg number
-check_args '3' "$#" 'user domain certificate [sslhome]'
+check_args '3' "$#" 'user domain ssl [sslhome]'
 
 # Checking argument format
 format_validation 'user' 'domain' 'ssl'
@@ -76,8 +76,8 @@ upd_web_domain_values
 add_web_config
 
 # Adding certificate to user dir
-cp -f $V_USERS/$user/cert/$SSL.crt $ssl_cert
-cp -f $V_USERS/$user/cert/$SSL.key $ssl_key
+cp -f $V_USERS/$user/ssl/$SSL.crt $ssl_cert
+cp -f $V_USERS/$user/ssl/$SSL.key $ssl_key
 
 # Running template trigger
 if [ -x $V_WEBTPL/apache_$template.sh ]; then

bin/v_change_web_domain_sslcert

@@ -78,8 +78,8 @@ if [ ! -z "$NGINX" ]; then
 fi
 
 # Adding new certificate to user dir
-cp -f $V_USERS/$user/cert/$SSL.crt $ssl_cert
-cp -f $V_USERS/$user/cert/$SSL.key $ssl_key
+cp -f $V_USERS/$user/ssl/$SSL.crt $ssl_cert
+cp -f $V_USERS/$user/ssl/$SSL.key $ssl_key
 
 # Deleting old certificate
 check_cert=$(grep "SSL='$old_ssl'" $V_USERS/$user/web.conf |wc -l)

bin/v_del_ssl_certificate bin/v_del_sys_user_sslbin/v_del_ssl_certificate renamed to bin/v_del_sys_user_ssl

@@ -13,7 +13,7 @@ ssl=$2
 source $VESTA/conf/vars.conf
 source $V_CONF/vesta.conf
 source $V_FUNC/shared.func
-source $V_FUNC/cert.func
+source $V_FUNC/ssl.func
 
 
 #----------------------------------------------------------#
@@ -41,7 +41,7 @@ is_cert_used
 #----------------------------------------------------------#
 
 # Deleting certificate
-rm -f $V_USERS/$user/cert/$ssl.*
+rm -f $V_USERS/$user/ssl/$ssl.*
 
 
 #----------------------------------------------------------#

bin/v_list_ssl_certificates bin/v_list_sys_user_sslbin/v_list_ssl_certificates renamed to bin/v_list_sys_user_ssl

@@ -19,7 +19,7 @@ json_list_cert() {
     echo '['
 
     # Checking certificates number
-    certificates=$(ls $V_USERS/$user/cert/ |grep '.crt' )
+    certificates=$(ls $V_USERS/$user/ssl/ |grep '.crt' )
     certificates_count=$(echo "$certificates" | wc -l)
     i=1
 
@@ -46,7 +46,7 @@ shell_list_cert() {
     fi
 
     # Listing files by mask
-    for cert in $(ls $V_USERS/$user/cert/ | grep '.crt'); do
+    for cert in $(ls $V_USERS/$user/ssl/ | grep '.crt'); do
         # Print result
         echo "${cert//.crt/}"
     done

func/domain.func

@@ -449,7 +449,7 @@ is_web_domain_key_empty() {
 
 is_web_domain_cert_valid() {
     # Checking file existance
-    path="$V_USERS/$user/cert"
+    path="$V_USERS/$user/ssl"
     if [ ! -e "$path/$ssl.crt" ] || [ ! -e "$path/$ssl.key" ]; then
         echo "Error: certificate not exist"
         log_event 'debug' "$E_CERT_NOTEXIST $V_EVENT"

func/cert.func func/ssl.funcfunc/cert.func renamed to func/ssl.func

@@ -1,6 +1,6 @@
 is_cert_free() {
     # Defining path
-    user_cert="$V_USERS/$user/cert/$cert"
+    user_cert="$V_USERS/$user/ssl/$cert"
 
     # Checking file existance
     if [ -e "$user_cert.crt" ] || [ -e "$user_cert.key" ]; then