From edcba719113676a93222ee3c97c2d5074e39b1c3 Mon Sep 17 00:00:00 2001 From: Joubert RedRat Date: Tue, 6 Jun 2017 01:22:38 -0300 Subject: [PATCH] Fix on ssl home definition on Lets Encrypt cert renew --- bin/v-add-letsencrypt-domain | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/v-add-letsencrypt-domain b/bin/v-add-letsencrypt-domain index 602c3c24d..a4c916b48 100755 --- a/bin/v-add-letsencrypt-domain +++ b/bin/v-add-letsencrypt-domain @@ -3,7 +3,7 @@ # options: USER DOMAIN [ALIASES] [RESTART] [NOTIFY] # # The function turns on SSL support for a domain. Parameter ssl_dir is a path -# to directory where 2 or 3 ssl files can be found. Certificate file +# to directory where 2 or 3 ssl files can be found. Certificate file # domain.tld.crt and its key domain.tld.key are mandatory. Certificate # authority domain.tld.ca file is optional. If home directory parameter # (ssl_home) is not set, https domain uses public_shtml as separate @@ -108,8 +108,9 @@ else fi # Adding SSL +ssl_home=$(search_objects 'web' 'LETSENCRYPT' 'yes' 'SSL_HOME') $BIN/v-delete-web-domain-ssl $user $domain >/dev/null 2>&1 -$BIN/v-add-web-domain-ssl $user $domain $ssl_dir +$BIN/v-add-web-domain-ssl $user $domain $ssl_dir $ssl_home if [ "$?" -ne '0' ]; then touch $VESTA/data/queue/letsencrypt.pipe sed -i "/ $domain /d" $VESTA/data/queue/letsencrypt.pipe