diff --git a/back/srv/dashboard/add b/back/srv/dashboard/add index b9cd52e..c159315 100755 --- a/back/srv/dashboard/add +++ b/back/srv/dashboard/add @@ -147,6 +147,6 @@ fi # Create SSL cert if "${LIB_DIR}/ssl_peer_add" "${hostname}" "${username}" "IP:${ipv4},IP:${ipv6}" - then printf 'Successfully signed SSL certs for %s\n' "${domain}" >>"${LOGFILE}" + then printf 'Successfully signed SSL certs for %s\n' "${domain}" >>"${LOGFILE}" else printf 'ERROR! Failed to create certs for %s with IPS: %s %s!\n' "${domain}" "${ipv4}" "${ipv6}" >>"${LOGFILE}" fi diff --git a/back/srv/dashboard/del b/back/srv/dashboard/del index 641882e..2090e59 100755 --- a/back/srv/dashboard/del +++ b/back/srv/dashboard/del @@ -90,12 +90,19 @@ while IFS=$'\t' read -r server_hostname server_ipv4 server_ipv6 server_pubkey se done <"${SERVERS_FILE}" # Respond to user +# Do it before updating nameserver and certs because +# if wireguard worked, there's no going back. The admin +# can clean up missing records and certs after checking the logs printf 'Deleted %s.%s.%s' "${hostname}" "${username}" "${TLD}" | "${LIB_DIR}/http_res" 202 # Update nameserver -# TODO: get these needed vars -#"${LIB_DIR}/ns_update_del" "${domain}" "${ipv4}" "${ipv6}" +if "${LIB_DIR}/ns_update_del" "${domain}" "${ipv4}" "${ipv6}" + then printf 'Successfully deleted %s from DNS server.\n' "${domain}" >>"${LOGFILE}" + else printf 'ERROR! Failed to delete %s %s %s from DNS server!\n' "${domain}" "${ipv4}" "${ipv6}" >>"${LOGFILE}" +fi -# Delete SSL certs -# TODO: get these needed vars -#"${LIB_DIR}/ssl_peer_del" "${hostname}" "${username}" +# Create SSL cert +if "${LIB_DIR}/ssl_peer_del" "${hostname}" "${username}" + then printf 'Successfully deleted SSL certs for %s\n' "${domain}" >>"${LOGFILE}" + else printf 'ERROR! Failed to delete certs for %s!\n' "${domain}" >>"${LOGFILE}" +fi