gf4
/
wagon
2
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Prepare to test that

master
Keith Irwin 2022-11-07 19:03:51 -07:00
parent d3d5087830
commit 8adc5c004c
Signed by: ki9
GPG Key ID: DF773B3F4A88DA86
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
back/lib/admin/peer/del
View File

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

46
back/lib/dashboard/peer/del
View File

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