show config under qr

Author: ipitio

debian/control

@@ -4,7 +4,7 @@ Homepage: https://github.com/ipitio/closure
 Standards-Version: 3.9.2
 
 Package: closure
-Version: 1.7.3
+Version: 1.7.4
 Maintainer: ipitio <21136719+ipitio@users.noreply.github.com>
 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

@@ -5,7 +5,7 @@
 set -a
 
 # Closure settings from env.sh
-this_dir=$(dirname "$(readlink -f "$0")")
+this_dir=$PWD
 source "$this_dir/env.sh"
 
 if [ -z "$CLS_TYPE_NODE" ]; then

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}; then
+if [ "${CLS_WG_ONLY:-false}" = "false" ]; then
     [ -d config ] || sudo mkdir config
     [[ -f config/wifis.json && -s config/wifis.json ]] || echo "{}" | sudo tee config/wifis.json
 
@@ -137,10 +137,9 @@ eval "cast pre-up ${*@Q}"
 ) &
 
 if [ "$CLS_DOCKER" = "true" ]; then
-    sudo systemctl stop isc-dhcp-server
-
     # prod starts wg
-    if ! ip a show "$CLS_INTERN_IFACE" | grep -q UP; then
+    if [ "${CLS_WG_ONLY:-false}" = "false" ] || ! sudo docker ps | grep -qE "pihole.*Up"; then
+        sudo docker compose down
         sudo systemctl restart docker
         sudo docker network prune -f
         until [ -n "$CLS_LOCAL_IP" ]; do
@@ -150,7 +149,6 @@ if [ "$CLS_DOCKER" = "true" ]; then
         sed -i "s/#\?- FTLCONF_LOCAL_IPV4=.*$/- FTLCONF_LOCAL_IPV4=$CLS_LOCAL_IP/" compose.yml
         sudo docker compose --profile prod up -d --force-recreate --remove-orphans
     elif ! sudo docker ps | grep -qE "wireguard.*Up"; then
-        sudo docker compose --profile prod up -d --force-recreate --remove-orphans
         sudo docker compose up -d wireguard
     fi
 else

wireguard/add.sh

@@ -20,7 +20,7 @@ if ! grep -q "$1" <<<"$PEERS"; then
 
     if [ "$CLS_DOCKER" = "true" ]; then
         export CLS_WG_ONLY=true
-        sudo bash restart.sh ${@@Q}
+        sudo bash restart.sh ${@@Q} 2>/dev/null
     else
         bash wireguard/etc/run
     fi
@@ -62,5 +62,5 @@ esac
 
 echo "$conf" | sudo tee "$path.conf" >/dev/null || exit 1
 CLS_WG_ONLY=true
-sudo bash restart.sh ${@@Q}
+sudo bash restart.sh ${@@Q} 2>/dev/null
 popd &>/dev/null || exit 1

wireguard/app/show-peer

@@ -18,6 +18,8 @@ for i in "$@"; do
   if grep -q "# ${PEER_ID}" wireguard/config/wg_confs/wg0.conf; then
     echo "PEER ${i} QR code:"
     qrencode -t ansiutf8 < wireguard/config/"${PEER_ID}"/"${PEER_ID}".conf
+    echo "PEER ${i} config:"
+    cat wireguard/config/"${PEER_ID}"/"${PEER_ID}".conf
   else
     echo "PEER ${i} is not active"
   fi

wireguard/etc/run

@@ -5,15 +5,7 @@
 # This file has been modified from the above source: paths were changed to be relative to the project root
 
 mkdir -p wireguard/config/wg_confs
-mkdir -p wireguard/config/templates
 
-# prepare templates
-if [[ ! -f wireguard/config/templates/server.conf ]]; then
-    cp wireguard/defaults/server.conf wireguard/config/templates/server.conf
-fi
-if [[ ! -f wireguard/config/templates/peer.conf ]]; then
-    cp wireguard/defaults/peer.conf wireguard/config/templates/peer.conf
-fi
 # add preshared key to user templates (backwards compatibility)
 if ! grep -q 'PresharedKey' wireguard/config/templates/peer.conf; then
     sed -i 's|^Endpoint|PresharedKey = \$\(cat wireguard/config/\${PEER_ID}/presharedkey-\${PEER_ID}\)\nEndpoint|' wireguard/config/templates/peer.conf