From 8adc5c004cb43c595d5b460056687be5353436dd Mon Sep 17 00:00:00 2001
From: Keith Irwin <git@ki9.us>
Date: Mon, 7 Nov 2022 19:03:51 -0700
Subject: [PATCH] Prepare to test that

---
 back/lib/admin/peer/del     | 46 ++++++++++++++++++-------------------
 back/lib/dashboard/peer/del | 46 ++++++++++++++++++-------------------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/back/lib/admin/peer/del b/back/lib/admin/peer/del
index 96a3c34..833c8c4 100755
--- a/back/lib/admin/peer/del
+++ b/back/lib/admin/peer/del
@@ -87,19 +87,19 @@ username="$(<<<"${domain}" cut -d'.' -f2)"
 # Wireguard
 # Run this function in parallel in the while loop below
 # https://stackoverflow.com/a/33058618
-for_server_do() {
-	[[ ${server_hostname:0:1} = \# ]] && return # Ignore comments
-	server_hostname="${1}"; server_ipv4="${2}"; server_ipv6="${3}"; server_pubkey="${4}"
-	server_endpoint="${5}"; server_admin="${6}"; server_secret="${7}"
-	if [ "${server_hostname}" == "${LOCAL_SERVER}" ]; then
-		if "${LIB_DIR}/wg_peer_del" "${pubkey}"; then
-			printf 'Deleted %s from local wireguard server.\n' "${domain}" >>"${LOGFILE}"
-		else
-			printf 'ERROR! Failed to delete %s from local wireguard server!\n' "${domain}" >>"${LOGFILE}"
+#for_server_do() {
+#	[[ ${server_hostname:0:1} = \# ]] && return # Ignore comments
+#	server_hostname="${1}"; server_ipv4="${2}"; server_ipv6="${3}"; server_pubkey="${4}"
+#	server_endpoint="${5}"; server_admin="${6}"; server_secret="${7}"
+#	if [ "${server_hostname}" == "${LOCAL_SERVER}" ]; then
+#		if "${LIB_DIR}/wg_peer_del" "${pubkey}"; then
+#			printf 'Deleted %s from local wireguard server.\n' "${domain}" >>"${LOGFILE}"
+#		else
+#			printf 'ERROR! Failed to delete %s from local wireguard server!\n' "${domain}" >>"${LOGFILE}"
 			# TODO: Send a 500 error
 			# TODO: clear existing progress
-			exit 15
-		fi
+#			exit 15
+#		fi
 	# TODO Add federated peer
 	#else
 	#	if "${LIB_DIR}/fed_peer_add" "${server_admin}" "${pubkey}" "${server_psk}" "${ipv4}/32,${ipv6}/128" "${server_secret}"; then
@@ -110,24 +110,24 @@ for_server_do() {
 	#		# TODO: clear existing progress
 	#	 exit 16
 	#	fi"${LIB_DIR}/fed_peer_del" "${server_admin}" "${pubkey}" "${server_secret}"
-	fi
-}; while IFS=$'\t' read -r server_hostname server_ipv4 server_ipv6 server_pubkey server_endpoint server_admin server_secret
-	do for_server_do "${server_hostname}" "${server_ipv4}" "${server_ipv6}" "${server_pubkey}" "${server_endpoint}" "${server_admin}" "${server_secret}" &
+#	fi
+#}; while IFS=$'\t' read -r server_hostname server_ipv4 server_ipv6 server_pubkey server_endpoint server_admin server_secret
+#	do for_server_do "${server_hostname}" "${server_ipv4}" "${server_ipv6}" "${server_pubkey}" "${server_endpoint}" "${server_admin}" "${server_secret}" &
 	# Uncomment if SERVERS_FILE is very big
 	#[ $( jobs | wc -l ) -ge $( nproc ) ] && wait
-done <"${SERVERS_FILE}" &
+#done <"${SERVERS_FILE}" &
 
 # Update nameserver
-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 &
+#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 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
+#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
 
 # Respond to user
 # Do it before updating nameserver and certs because
diff --git a/back/lib/dashboard/peer/del b/back/lib/dashboard/peer/del
index effd3c1..05a52d1 100755
--- a/back/lib/dashboard/peer/del
+++ b/back/lib/dashboard/peer/del
@@ -88,19 +88,19 @@ username="$(<<<"${domain}" cut -d'.' -f2)"
 # Wireguard
 # Run this function in parallel in the while loop below
 # https://stackoverflow.com/a/33058618
-for_server_do() {
-	[[ ${server_hostname:0:1} = \# ]] && return # Ignore comments
-	server_hostname="${1}"; server_ipv4="${2}"; server_ipv6="${3}"; server_pubkey="${4}"
-	server_endpoint="${5}"; server_admin="${6}"; server_secret="${7}"
-	if [ "${server_hostname}" == "${LOCAL_SERVER}" ]; then
-		if "${LIB_DIR}/wg_peer_del" "${pubkey}"; then
-			printf 'Deleted %s from local wireguard server.\n' "${domain}" >>"${LOGFILE}"
-		else
-			printf 'ERROR! Failed to delete %s from local wireguard server!\n' "${domain}" >>"${LOGFILE}"
+#for_server_do() {
+#	[[ ${server_hostname:0:1} = \# ]] && return # Ignore comments
+#	server_hostname="${1}"; server_ipv4="${2}"; server_ipv6="${3}"; server_pubkey="${4}"
+#	server_endpoint="${5}"; server_admin="${6}"; server_secret="${7}"
+#	if [ "${server_hostname}" == "${LOCAL_SERVER}" ]; then
+#		if "${LIB_DIR}/wg_peer_del" "${pubkey}"; then
+#			printf 'Deleted %s from local wireguard server.\n' "${domain}" >>"${LOGFILE}"
+#		else
+#			printf 'ERROR! Failed to delete %s from local wireguard server!\n' "${domain}" >>"${LOGFILE}"
 			# TODO: Send a 500 error
 			# TODO: clear existing progress
-			exit 15
-		fi
+#			exit 15
+#		fi
 	# TODO Add federated peer
 	#else
 	#	if "${LIB_DIR}/fed_peer_add" "${server_admin}" "${pubkey}" "${server_psk}" "${ipv4}/32,${ipv6}/128" "${server_secret}"; then
@@ -111,24 +111,24 @@ for_server_do() {
 	#		# TODO: clear existing progress
 	#	 exit 16
 	#	fi"${LIB_DIR}/fed_peer_del" "${server_admin}" "${pubkey}" "${server_secret}"
-	fi
-}; while IFS=$'\t' read -r server_hostname server_ipv4 server_ipv6 server_pubkey server_endpoint server_admin server_secret
-	do for_server_do "${server_hostname}" "${server_ipv4}" "${server_ipv6}" "${server_pubkey}" "${server_endpoint}" "${server_admin}" "${server_secret}" &
+#	fi
+#}; while IFS=$'\t' read -r server_hostname server_ipv4 server_ipv6 server_pubkey server_endpoint server_admin server_secret
+#	do for_server_do "${server_hostname}" "${server_ipv4}" "${server_ipv6}" "${server_pubkey}" "${server_endpoint}" "${server_admin}" "${server_secret}" &
 	# Uncomment if SERVERS_FILE is very big
 	#[ $( jobs | wc -l ) -ge $( nproc ) ] && wait
-done <"${SERVERS_FILE}" &
+#done <"${SERVERS_FILE}" &
 
 # Update nameserver
-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 &
+#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 &
 
 # 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
+#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
 
 # Respond to user
 # Do it before updating nameserver and certs because