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

Fixed logging

master
Keith Irwin 2022-09-10 08:42:57 -06:00
parent d4fb5caf98
commit 27ab4843d7
Signed by: ki9
GPG Key ID: DF773B3F4A88DA86
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
back/lib/wg_peer_add
View File

@ -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
)

4
back/srv/dashboard/add
View File

@ -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