diff --git a/back/lib/wg_peer_add b/back/lib/wg_peer_add index 6381e09..5a89fe9 100755 --- a/back/lib/wg_peer_add +++ b/back/lib/wg_peer_add @@ -21,7 +21,6 @@ CONFIG_FILE='/etc/wgapi/config' source "${CONFIG_FILE}" res="$(sudo /usr/bin/wg set "${TLD}" peer "${1}" preshared-key <(printf '%s' "${2}") allowed-ips "${3}")" || ( - printf 'ERROR! wg failed to add peer for %s\n' "${3}" >>"${LOGFILE}" - printf '%s\n' "${res}" >>"${LOGFILE}" + printf '%s %s' "${?} ${res}\n" >>"${LOGFILE}" exit 6 ) diff --git a/back/srv/dashboard/add b/back/srv/dashboard/add index 63a71a9..e40302e 100755 --- a/back/srv/dashboard/add +++ b/back/srv/dashboard/add @@ -101,13 +101,13 @@ while IFS=$'\t' read -r server_hostname server_ipv4 server_ipv6 server_pubkey se # Add new user to local server then printf 'Adding %s to local server...\n' "${domain}" >>"${LOGFILE}" "${LIB_DIR}/wg_peer_add" "${pubkey}" "${server_psk}" "${ipv4}/32,${ipv6}/128" || ( - printf 'ERROR! Failed to add new peer %s to local server!\n' "${ipv4}" >>"${LOGFILE}" + printf 'ERROR! Failed to add new peer %s to local wireguard server!\n' "${ipv4}" >>"${LOGFILE}" # TODO: clear existing progress and exit 15 ) # Send new user config to federated server else printf 'Sending %s to remote server %s...\n' "${domain}" "${server_hostname}" >>"${LOGFILE}" #"${LIB_DIR}/fed_add" "${server_admin}" "${pubkey}" "${server_psk}" "${ipv4}/32,${ipv6}/128" "${server_secret}" || ( - # printf 'ERROR! Failed to add new peer %s to federated server %s!\n' "${ipv4}" "${server_hostname}" >>"${LOGFILE}" + # printf 'ERROR! Failed to add new peer %s to federated wireguard server %s!\n' "${ipv4}" "${server_hostname}" >>"${LOGFILE}" # # TODO: clear existing progress and exit 16 #) fi