github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 02:28:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix LE - JSON pretty

Browse source
This commit is contained in:
Serghey Rodin 2016-06-27 01:38:01 +03:00
commit 5edfe8dd32
2 changed files with 40 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

68
bin/v-list-letsencrypt-user
View file

@ -16,33 +16,36 @@ format=${2-shell}
# Includes
source $VESTA/func/main.sh
# 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}"
# JSON list function
json_list() {
echo '{'
echo ' "'$user'": {
"EMAIL": "'$EMAIL'",
"EXPONENT": "'$EXPONENT'",
"MODULUS": "'$MODULUS'",
"THUMB: "'$THUMB'"
}'
echo '}'
}
# 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
# 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"
}
@ -53,7 +56,7 @@ shell_list_conf() {
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
@ -61,11 +64,14 @@ fi
# Action #
#----------------------------------------------------------#
# Listing system config
case $format in
json) json_list_conf ;;
plain) shell_list_conf ;;
shell) shell_list_conf | column -t ;;
source $USER_DATA/ssl/le.conf
# Listing data
case $format in
json) json_list ;;
plain) plain_list ;;
csv) csv_list ;;
shell) shell_list ;;
esac