|
|
@@ -80,7 +80,7 @@ if [ "$?" -ne 0 ]; then
|
|
|
touch $HESTIA/data/queue/letsencrypt.pipe
|
|
|
sed -i "/ $domain /d" $HESTIA/data/queue/letsencrypt.pipe
|
|
|
send_notice "LETSENCRYPT" "Account registration failed"
|
|
|
- check_result $E_CONNECT "LE account registration" >/dev/null
|
|
|
+ check_result $E_CONNECT "LE account registration" > /dev/null
|
|
|
fi
|
|
|
|
|
|
# Parsing LetsEncrypt account data
|
|
|
@@ -160,7 +160,7 @@ for auth in $authz; do
|
|
|
ln -s "$conf" "$sconf"
|
|
|
fi
|
|
|
$BIN/v-restart-proxy
|
|
|
- check_result $? "Proxy restart failed" >/dev/null
|
|
|
+ check_result $? "Proxy restart failed" > /dev/null
|
|
|
|
|
|
else
|
|
|
well_known="$HOMEDIR/$user/web/$rdomain/public_html/.well-known"
|
|
|
@@ -170,7 +170,7 @@ for auth in $authz; do
|
|
|
chown -R $user:$user $well_known
|
|
|
fi
|
|
|
$BIN/v-restart-web
|
|
|
- check_result $? "Web restart failed" >/dev/null
|
|
|
+ check_result $? "Web restart failed" > /dev/null
|
|
|
fi
|
|
|
|
|
|
# Requesting ACME validation / STEP 5
|
|
|
@@ -234,13 +234,13 @@ tail -n $ca_end $ssl_dir/$domain.pem > $ssl_dir/$domain.ca
|
|
|
|
|
|
# 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-delete-web-domain-ssl $user $domain > /dev/null 2>&1
|
|
|
$BIN/v-add-web-domain-ssl $user $domain $ssl_dir $ssl_home
|
|
|
if [ "$?" -ne '0' ]; then
|
|
|
touch $HESTIA/data/queue/letsencrypt.pipe
|
|
|
sed -i "/ $domain /d" $HESTIA/data/queue/letsencrypt.pipe
|
|
|
send_notice 'LETSENCRYPT' "$domain certificate installation failed"
|
|
|
- check_result $? "SSL install" >/dev/null
|
|
|
+ check_result $? "SSL install" > /dev/null
|
|
|
fi
|
|
|
|
|
|
# Adding LE autorenew cronjob
|
|
|
@@ -262,7 +262,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$LETSENCRYPT' 'yes'
|
|
|
# Hestia #
|
|
|
#----------------------------------------------------------#
|
|
|
|
|
|
-# Deleteing task from queue
|
|
|
+# Deleting task from queue
|
|
|
touch $HESTIA/data/queue/letsencrypt.pipe
|
|
|
sed -i "/ $domain /d" $HESTIA/data/queue/letsencrypt.pipe
|
|
|
|
|
|
@@ -273,4 +273,4 @@ send_notice 'LETSENCRYPT' "$domain SSL has been installed successfully"
|
|
|
# Logging
|
|
|
log_event "$OK" "$ARGUMENTS"
|
|
|
|
|
|
-exit
|
|
|
+exit
|