isc can be used with docker too

Author: ipitio

debian/control

@@ -4,7 +4,7 @@ Homepage: https://github.com/ipitio/closure
 Standards-Version: 3.9.2
 
 Package: closure
-Version: 1.7.4
+Version: 1.7.5
 Maintainer: ipitio <[email protected]>
 Depends: curl, flatpak, gpg, hostapd, isc-dhcp-server, iw, macchanger, netplan.io, network-manager, net-tools, qrencode, rfkill, wireguard, wireless-tools, wget
 Recommends: containerd.io, docker-ce, docker-ce-cli, docker-buildx-plugin, docker-compose-plugin

lib.sh

@@ -187,15 +187,16 @@ start_hostapd() {
                         fi
 
                         sudo hostapd -i "$wiface" -P /run/hostapd.pid -B hostapd/"$config".conf
-                        sudo iw dev "$wiface" set power_save off
+                        sudo iw dev "$wiface" set power_save off 2>/dev/null
                         local octet
                         octet=$(ifconfig "$wiface" | grep -zoP '(?<=inet 10\.42\.)\S+(?=\.1)')
 
                         if [ -z "$octet" ]; then
                             octet=$((1 + $( (
                                 ifconfig | grep -zoP '(?<=10\.42\.)\S+(?=\.1)'
                                 echo 1
-                            ) | grep -v 255 | sort -ru | head -n1)))
+                            ) | grep -v 255 | sort -ru | head -n1))) 2>/dev/null
+                            [ -n "$octet" ] || octet=1
                             sudo ifconfig "$wiface" 10.42."$octet".1 netmask 255.255.255.0
                         fi
 

restart.sh

@@ -8,7 +8,7 @@ source "lib.sh"
 sudo sysctl -w net.ipv4.ip_forward=0
 sudo sysctl -w net.ipv6.conf.all.forwarding=0
 eval "cast pre-down ${*@Q}"
-sudo docker ps | grep -q wireguard && sudo docker compose stop wireguard || sudo wg-quick down "$CLS_INTERN_IFACE"
+sudo docker ps | grep -q wireguard && sudo docker compose stop wireguard || sudo wg-quick down "$CLS_INTERN_IFACE" 2>/dev/null
 
 # shellcheck disable=SC2009
 ps -aux | grep -P "^[^-]+$this_dir/start.sh" | awk '{print $2}' | while read -r pid; do sudo kill -9 "$pid" &>/dev/null; done

start.sh

@@ -13,7 +13,7 @@ source "lib.sh"
 pids=$(ps -o ppid=$$)
 ps -aux | grep -P "^[^-]+$this_dir/start.sh" | awk '{print $2}' | while read -r pid; do grep -q "$pid" <<<"$pids" || sudo kill -9 "$pid" &>/dev/null; done
 
-if [ "${CLS_WG_ONLY:-false}" = "false" ]; then
+if [ ! "${CLS_WG_ONLY:-false}" = "true" ]; then
     [ -d config ] || sudo mkdir config
     [[ -f config/wifis.json && -s config/wifis.json ]] || echo "{}" | sudo tee config/wifis.json
 
@@ -79,13 +79,12 @@ if [ "$CLS_DOCKER" = "true" ]; then
             sudo ip6tables -L -t "$table" | grep -q "$chain" || sudo ip6tables -N "$chain" -t "$table"
         done
     done
-else
-    sudo sysctl -w net.ipv4.ip_forward=0
-    sudo sysctl -w net.ipv6.conf.all.forwarding=0
-    for iface in $(wg | grep -oP '(?<=interface: ).+'); do sudo wg-quick down "$iface"; done
-    wg | grep -oP '(?<=^interface: ).+' | while read -r iface; do sudo wg-quick down "$iface" &>/dev/null; done
 fi
 
+sudo sysctl -w net.ipv4.ip_forward=0
+sudo sysctl -w net.ipv6.conf.all.forwarding=0
+for iface in $(wg | grep -oP '(?<=interface: ).+'); do sudo wg-quick down "$iface"; done
+wg | grep -oP '(?<=^interface: ).+' | while read -r iface; do sudo wg-quick down "$iface" &>/dev/null; done
 eval "cast pre-up ${*@Q}"
 
 (
@@ -138,8 +137,9 @@ eval "cast pre-up ${*@Q}"
 
 if [ "$CLS_DOCKER" = "true" ]; then
     # prod starts wg
-    if [ "${CLS_WG_ONLY:-false}" = "false" ] || ! sudo docker ps | grep -qE "pihole.*Up"; then
+    if [ ! "${CLS_WG_ONLY:-false}" = "true" ] || ! sudo docker ps | grep -qE "pihole.*Up"; then
         sudo docker compose down
+        sudo docker compose ps -aq | xargs -r sudo docker rm -f
         sudo systemctl restart docker
         sudo docker network prune -f
         until [ -n "$CLS_LOCAL_IP" ]; do
@@ -165,9 +165,10 @@ else
         sudo wg-quick down "$iface"
         sudo wg-quick up "$iface"
     done
-    restart_isc
 fi
 
+restart_isc
+
 if [[ "$CLS_TYPE_NODE" == "haas" && -n "$CLS_SAAH_PEER" ]]; then
     [[ -d "wireguard/config/peer_$CLS_SAAH_PEER" ]] || exec sudo bash wireguard/add.sh "$CLS_SAAH_PEER" -- ${@@Q}
     saah_ip="$(grep -oP '(?<=Address = ).+' "wireguard/config/peer_$CLS_SAAH_PEER/peer_$CLS_SAAH_PEER.conf" 2>/dev/null)"