From ec059b29d48c1323f592deeb2eb1970d56870a0b Mon Sep 17 00:00:00 2001 From: Derek Crudgington Date: Thu, 6 Feb 2025 20:51:06 +0000 Subject: [PATCH] Cleaned up wireguard config --- lib/wireguard.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/wireguard.sh b/lib/wireguard.sh index f7e0a44..c36ae82 100644 --- a/lib/wireguard.sh +++ b/lib/wireguard.sh @@ -88,12 +88,10 @@ cat > /federated/apps/wireguard/data/config/coredns/Corefile < /federated/apps/mail/data/root/certs/mailfile < @@ -133,13 +131,10 @@ EOF docker exec mail bash -c "mail -r admin@$DOMAIN -a \"Content-type: text/html\" -s \"Application installed on $DOMAIN\" $EMAIL < /root/certs/mailfile" rm /federated/apps/mail/data/root/certs/mailfile - kill -9 $SPINPID &> /dev/null echo -ne "done.\n" } uninstall_wireguard() { echo -ne "* Uninstalling wireguard container.." - spin & - SPINPID=$! # First stop the service cd /federated/apps/wireguard && docker compose -f docker-compose.yml -p wireguard down &> /dev/null @@ -147,12 +142,19 @@ uninstall_wireguard() { # Delete the app directory rm -rf /federated/apps/wireguard - kill -9 $SPINPID &> /dev/null + docker exec pdns pdnsutil delete-rrset $DOMAIN vpn A + docker exec pdns pdnsutil delete-rrset $DOMAIN wireguard A + echo -ne "done.\n" } start_wireguard() { # Start service with command to make sure it's up before proceeding start_service "wireguard" "nc -uvz 192.168.0.24 51820 &> /dev/null" "8" + docker exec pdns pdnsutil add-record $DOMAIN wireguard A 86400 $EXTERNALIP &> /dev/null + [ $? -ne 0 ] && fail "Couldn't add dns record" + docker exec pdns pdnsutil add-record $DOMAIN vpn A 86400 $EXTERNALIP &> /dev/null + [ $? -ne 0 ] && fail "Couldn't add dns record" + echo -ne "done." }