Merge pull request #194 from linuxserver/wg-svc

Optimize wg and coredns services

readme-vars.yml

@@ -121,7 +121,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: "12.10.22:", desc: "Add Alpine branch." }
+  - { date: "12.10.22:", desc: "Add Alpine branch. Optimize wg and coredns services." }
   - { date: "09.10.22:", desc: "Switch back to iptables-legacy due to issues on some hosts." }
   - { date: "04.10.22:", desc: "Rebase to Jammy. Upgrade to s6v3." }
   - { date: "16.05.22:", desc: "Improve NAT handling in server mode when multiple ethernet devices are present." }

root/defaults/Corefile

@@ -1,4 +1,5 @@
 . {
     loop
+    health
     forward . /etc/resolv.conf
 }

root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run

@@ -162,8 +162,7 @@ else
     echo "**** No client conf found. Provide your own client conf as \"/config/wg0.conf\" and restart the container. ****"
     sleep infinity
   fi
-  echo "**** Disabling CoreDNS ****"
-  rm -rf /etc/services.d/coredns
+  printf "false" > /run/s6/container_environment/USE_COREDNS
 fi
 
 # set up CoreDNS

root/etc/s6-overlay/s6-rc.d/svc-coredns/run

@@ -1,11 +1,20 @@
 #!/usr/bin/with-contenv bash
 
 if netstat -apn | grep -q ":53 "; then
-  echo "Another service is using port 53, disabling CoreDNS"
-  sleep infinity
+    USE_COREDNS="false"
+fi
+
+if [[ ${USE_COREDNS} == "false" ]]; then
+    s6-notifyoncheck -d -n 300 -w 1000 -c "echo **** Disabling CoreDNS ****" \
+        sleep infinity
+elif grep -q "health" /config/coredns/Corefile; then
+    exec \
+        s6-notifyoncheck -d -n 300 -w 1000 -c "redirfd -w 1 /dev/null curl -s http://localhost:8080/health" \
+            cd /config/coredns \
+            /app/coredns -dns.port=53
 else
-  exec \
-    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z -u 127.0.0.1 53" \
-        cd /config/coredns \
-        /app/coredns -dns.port=53
+    exec \
+        s6-notifyoncheck -d -n 300 -w 1000 -c "nc -zu localhost 53" \
+            cd /config/coredns \
+            /app/coredns -dns.port=53
 fi

root/etc/s6-overlay/s6-rc.d/svc-wireguard/down

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/svc-wireguard/finish

root/etc/s6-overlay/s6-rc.d/svc-wireguard/finish

@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv bash
+
+wg-quick down wg0

root/etc/s6-overlay/s6-rc.d/svc-wireguard/run

@@ -1,14 +1,3 @@
 #!/usr/bin/with-contenv bash
 
-_term() {
-  echo "Caught SIGTERM signal!"
-  wg-quick down wg0
-}
-
-trap _term SIGTERM
-
 wg-quick up wg0
-
-sleep infinity &
-
-wait

root/etc/s6-overlay/s6-rc.d/svc-wireguard/type

@@ -1 +1 @@
-longrun
+oneshot

root/etc/s6-overlay/s6-rc.d/svc-wireguard/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/svc-wireguard/run