From b12190acbad16a16cf57006161549c8ef8d037b9 Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Sun, 31 Jul 2016 06:45:04 -0400 Subject: [PATCH] *Add LETSENCRYPT object to web config --- bin/v-add-letsencrypt-domain | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/bin/v-add-letsencrypt-domain b/bin/v-add-letsencrypt-domain index f1186f46..c47d0dba 100755 --- a/bin/v-add-letsencrypt-domain +++ b/bin/v-add-letsencrypt-domain @@ -38,7 +38,8 @@ is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" is_object_valid 'web' 'DOMAIN' "$domain" is_object_unsuspended 'web' 'DOMAIN' "$domain" - +is_object_value_empty 'web' 'DOMAIN' "$domain" '$LETSENCRYPT' +get_domain_values 'web' #----------------------------------------------------------# # Action # @@ -86,11 +87,24 @@ $BIN/v-delete-web-domain-ssl $user $domain >/dev/null 2>&1 $BIN/v-add-web-domain-ssl $user $domain $ssl_dir check_result $? "SSL install" >/dev/null +if [ ! -z "$LETSENCRYPT" ]; then + add_object_key 'web' 'DOMAIN' "$domain" '$LETSENCRYPT' 'yes' +else + update_object_value 'web' 'DOMAIN' "$domain" '$LETSENCRYPT' 'yes' +fi + #----------------------------------------------------------# # Vesta # #----------------------------------------------------------# +# Restarting web +if [ "$restart" != 'no' ]; then + $BIN/v-restart-web $restart + check_result $? "Web restart failed" >/dev/null +fi + + # Logging log_event "$OK" "$ARGUMENTS"