github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-20 21:34:11 -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

9
bin/v-check-letsencrypt-domain
View file

@ -29,7 +29,7 @@ encode_base64() {
#----------------------------------------------------------# #----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN' check_args '2' "$#" 'USER DOMAIN'
validate_format 'user' 'domain' is_format_valid 'user' 'domain'
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
is_object_valid 'user' 'USER' "$user" is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user"
@ -48,7 +48,7 @@ fi
source $USER_DATA/ssl/le.conf source $USER_DATA/ssl/le.conf
api='https://acme-v01.api.letsencrypt.org' api='https://acme-v01.api.letsencrypt.org'
r_domain=$(echo "$check_domain" |cut -f 2 -d \'|tail -n1) r_domain=$(echo "$check_domain" |cut -f 2 -d \')
key="$USER_DATA/ssl/user.key" key="$USER_DATA/ssl/user.key"
exponent="$EXPONENT" exponent="$EXPONENT"
modulus="$MODULUS" modulus="$MODULUS"
@ -77,7 +77,6 @@ answer=$(curl -s -i -d "$data" "$api/acme/new-authz")
# Checking http answer status # Checking http answer status
status=$(echo "$answer" |grep HTTP/1.1 |tail -n1 |cut -f2 -d ' ') status=$(echo "$answer" |grep HTTP/1.1 |tail -n1 |cut -f2 -d ' ')
if [[ "$status" -ne "201" ]]; then 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" check_result $E_CONNECT "LetsEncrypt challenge request $status"
fi fi
@ -96,7 +95,6 @@ if [ "$WEB_SYSTEM" = 'nginx' ] || [ "$PROXY_SYSTEM" = 'nginx' ]; then
echo ' return 200 "$1.'$thumb'";' >> $conf echo ' return 200 "$1.'$thumb'";' >> $conf
echo '}' >> $conf echo '}' >> $conf
fi fi
echo $conf
else else
acme="$HOMEDIR/$user/web/$r_domain/public_html/.well-known/acme-challenge" acme="$HOMEDIR/$user/web/$r_domain/public_html/.well-known/acme-challenge"
echo "$token" > $acme/$token.$thumb echo "$token" > $acme/$token.$thumb
@ -112,7 +110,6 @@ else
$BIN/v-restart-web $BIN/v-restart-web
check_result $? "Web restart failed" >/dev/null check_result $? "Web restart failed" >/dev/null
fi fi
sleep 30 sleep 30
# Defining ACME query (request validation) # Defining ACME query (request validation)
@ -145,6 +142,6 @@ fi
#----------------------------------------------------------# #----------------------------------------------------------#
# Logging # Logging
log_event "$OK" "$EVENT" log_event "$OK" "$ARGUMENTS"
exit exit

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

@ -16,33 +16,36 @@ format=${2-shell}
# Includes # Includes
source $VESTA/func/main.sh source $VESTA/func/main.sh
# Json function # JSON list function
json_list_conf() { json_list() {
lines=$(wc -l $USER_DATA/ssl/le.conf | cut -f 1 -d ' ') echo '{'
i='0' echo ' "'$user'": {
IFS=$'\n' "EMAIL": "'$EMAIL'",
echo -e "{\n\t\"LETSENCRYPT\": {" "EXPONENT": "'$EXPONENT'",
for str in $(cat $USER_DATA/ssl/le.conf); do "MODULUS": "'$MODULUS'",
(( ++i)) "THUMB: "'$THUMB'"
key=${str%%=*} }'
value=${str#*=} echo '}'
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 function # SHELL list function
shell_list_conf() { shell_list() {
IFS=$'\n' echo "USER: $user"
for str in $(cat $USER_DATA/ssl/le.conf); do echo "EMAIL: $EMAIL"
key=${str%%=*} echo "THUMB: $THUMB"
value=${str#*=} echo "EXPONENT: $EXPONENT"
echo "$key: ${value//\'/}" echo "MODULUS: $MODULUS"
done }
# 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"
} }
@ -61,11 +64,14 @@ fi
# Action # # Action #
#----------------------------------------------------------# #----------------------------------------------------------#
# Listing system config source $USER_DATA/ssl/le.conf
# Listing data
case $format in case $format in
json) json_list_conf ;; json) json_list ;;
plain) shell_list_conf ;; plain) plain_list ;;
shell) shell_list_conf | column -t ;; csv) csv_list ;;
shell) shell_list ;;
esac esac