fix for userlist

bin/v-backup-users

@@ -27,7 +27,7 @@ $BIN/v-check-vesta-license >/dev/null
 if [ -z "$BACKUP_SYSTEM" ]; then
     exit
 fi
-for user in $(ls $VESTA/data/users); do
+for user in $(grep '@' /etc/passwd |cut -f1 -d:); do
     check_suspend=$(grep "SUSPENDED='no'" $VESTA/data/users/$user/user.conf)
     log=$VESTA/log/backup.log
     if [ ! -z "$check_suspend" ]; then

bin/v-check-letsencrypt-domain

@@ -29,14 +29,14 @@ encode_base64() {
 #----------------------------------------------------------#
 
 check_args '2' "$#" 'USER DOMAIN'
-is_format_valid 'user' 'domain'
+validate_format 'user' 'domain'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 if [ ! -e "$USER_DATA/ssl/le.conf" ]; then
     check_result $E_NOTEXIST "LetsEncrypt key doesn't exist"
 fi
-check_domain=$(grep -w "$domain'" $USER_DATA/web.conf)
+check_domain=$(grep -w "$domain" $USER_DATA/web.conf)
 if [ -z "$check_domain" ]; then
     check_result $E_NOTEXIST "domain $domain doesn't exist"
 fi
@@ -48,7 +48,7 @@ fi
 
 source $USER_DATA/ssl/le.conf
 api='https://acme-v01.api.letsencrypt.org'
-r_domain=$(echo "$check_domain" |cut -f 2 -d \')
+r_domain=$(echo "$check_domain" |cut -f 2 -d \'|tail -n1)
 key="$USER_DATA/ssl/user.key"
 exponent="$EXPONENT"
 modulus="$MODULUS"
@@ -77,16 +77,15 @@ answer=$(curl -s -i -d "$data" "$api/acme/new-authz")
 # Checking http answer status
 status=$(echo "$answer" |grep HTTP/1.1 |tail -n1 |cut -f2 -d ' ')
 if [[ "$status" -ne "201" ]]; then
+    echo -e "$(date) $domain $status\n$answer\n$(dig @8.8.8.8 $domain +short)" >> /tmp/le-log.txt
     check_result $E_CONNECT "LetsEncrypt challenge request $status"
 fi
 
 # Parsing domain nonce,token and uri
 nonce=$(echo "$answer" |grep Nonce |cut -f2 -d \ |tr -d '\r\n')
 protected=$(echo -n '{"nonce":"'"$nonce"'"}' |encode_base64)
-token=$(echo "$answer" |tr ',' '\n' |grep -A 3 http-01 |grep token)
-token=$(echo "$token" |cut -f 4 -d \")
-uri=$(echo "$answer" |tr ',' '\n' |grep -A 3 http-01 |grep uri)
-uri=$(echo "$uri" |cut -f 4 -d \")
+token=$(echo "$answer" |grep -A 3 http-01 |grep token |cut -f 4 -d \")
+uri=$(echo "$answer" |grep -A 3 http-01 |grep uri |cut -f 4 -d \")
 
 # Adding location wrapper for request challenge
 if [ "$WEB_SYSTEM" = 'nginx' ] || [ "$PROXY_SYSTEM" = 'nginx' ]; then
@@ -96,20 +95,26 @@ if [ "$WEB_SYSTEM" = 'nginx' ] || [ "$PROXY_SYSTEM" = 'nginx' ]; then
         echo '    default_type text/plain;' >> $conf
         echo '    return 200 "$1.'$thumb'";' >> $conf
         echo '}' >> $conf
-        if [ ! -z "$PROXY_SYSTEM" ]; then
-            $BIN/v-restart-proxy
-            check_result $? "Proxy restart failed" >/dev/null
-        else
-            $BIN/v-restart-web
-            check_result $? "Web restart failed" >/dev/null
-        fi
     fi
+    echo $conf
 else
     acme="$HOMEDIR/$user/web/$r_domain/public_html/.well-known/acme-challenge"
     echo "$token" > $acme/$token.$thumb
     chown -R $user:$user $HOMEDIR/$user/web/$r_domain/public_html/.well-known
 fi
 
+# Restarting web server
+if [ -z "$PROXY_SYSTEM" ]; then
+    $BIN/v-restart-web
+    check_result $? "Proxy restart failed" >/dev/null
+else
+    $BIN/v-restart-proxy
+    $BIN/v-restart-web
+    check_result $? "Web restart failed" >/dev/null
+fi
+
+sleep 30
+
 # Defining ACME query (request validation)
 query='{"resource":"challenge","type":"http-01","keyAuthorization"'
 query=$query':"'$token.$thumb'","token":"'$token'"}'
@@ -123,7 +128,7 @@ data=$data'"payload":"'"$payload"'","signature":"'"$signature"'"}'
 answer=$(curl -s -i -d "$data" "$uri")
 
 # Checking domain validation status
-status=$(echo $answer |tr ',' '\n' |grep status |cut -f 4 -d \")
+status=$(echo $answer |grep status |cut -f 4 -d \")
 location=$(echo "$answer" |grep Location: |awk '{print $2}' |tr -d '\r\n')
 while [ "$status" = 'pending' ] ; do
     answer=$(curl -s -i "$location")
@@ -140,6 +145,6 @@ fi
 #----------------------------------------------------------#
 
 # Logging
-log_event "$OK" "$ARGUMENTS"
+log_event "$OK" "$EVENT"
 
 exit

bin/v-list-letsencrypt-user

@@ -16,36 +16,33 @@ format=${2-shell}
 # Includes
 source $VESTA/func/main.sh
 
-# JSON list function
-json_list() {
-    echo '{'
-    echo '    "'$user'": {
-        "EMAIL": "'$EMAIL'",
-        "EXPONENT": "'$EXPONENT'",
-        "MODULUS": "'$MODULUS'",
-        "THUMB: "'$THUMB'"
-    }'
-    echo '}'
+# Json function
+json_list_conf() {
+    lines=$(wc -l $USER_DATA/ssl/le.conf | cut -f 1 -d ' ')
+    i='0'
+    IFS=$'\n'
+    echo -e "{\n\t\"LETSENCRYPT\": {"
+    for str in $(cat $USER_DATA/ssl/le.conf); do
+        (( ++i))
+        key=${str%%=*}
+        value=${str#*=}
+        if [ "$i" -lt "$lines" ]; then
+            echo -e "\t\t\"$key\": \"${value//\'/}\","
+        else
+            echo -e "\t\t\"$key\": \"${value//\'/}\""
+        fi
+    done
+    echo -e "\t}\n}"
 }
 
-# SHELL list function
-shell_list() {
-    echo "USER:           $user"
-    echo "EMAIL:          $EMAIL"
-    echo "THUMB:          $THUMB"
-    echo "EXPONENT:       $EXPONENT"
-    echo "MODULUS:        $MODULUS"
-}
-
-# PLAIN list function
-plain_list() {
-    echo -e "$user\t$EMAIL\t$EXPONENT\t$MODULUS\t$THUMB"
-}
-
-# CSV list function
-csv_list() {
-    echo "USER,EMAIL,EXPONENT,MODULUS,THUMB"
-    echo "$user,$EMAIL,$EXPONENT,$MODULUS,$THUMB"
+# Shell function
+shell_list_conf() {
+    IFS=$'\n'
+    for str in $(cat $USER_DATA/ssl/le.conf); do
+        key=${str%%=*}
+        value=${str#*=}
+        echo "$key: ${value//\'/}"
+    done
 }
 
 
@@ -56,7 +53,7 @@ csv_list() {
 check_args '1' "$#" 'USER [FORMAT]'
 is_object_valid 'user' 'USER' "$user"
 if [ ! -e "$USER_DATA/ssl/le.conf" ]; then
-    check_result $E_NOTEXIST "LetsEncrypt user account doesn't exist"
+        check_result $E_NOTEXIST "LetsEncrypt user account doesn't exist"
 fi
 
 
@@ -64,14 +61,11 @@ fi
 #                       Action                             #
 #----------------------------------------------------------#
 
-source $USER_DATA/ssl/le.conf
-
-# Listing data
-case $format in
-    json)   json_list ;;
-    plain)  plain_list ;;
-    csv)    csv_list ;;
-    shell)  shell_list ;;
+# Listing system config
+case $format in 
+    json)   json_list_conf ;;
+    plain)  shell_list_conf ;;
+    shell)  shell_list_conf | column -t ;;
 esac
 
 

bin/v-update-user-stats

@@ -39,7 +39,7 @@ fi
 
 # Creating user_list
 if [ -z "$user" ]; then
-    user_list=$(ls $VESTA/data/users)
+    user_list=$(grep '@' /etc/passwd |cut -f1 -d:)
 else
     user_list="$user"
 fi