update version

docker-compose.yml

@@ -239,6 +239,8 @@ services:
               required: true # default
             - path: ./override.env
               required: false
+        environment:
+            ADDRESS: ${WGADDRESS}
         cap_add:
             - NET_ADMIN
         devices:
@@ -277,6 +279,8 @@ services:
               required: true # default
             - path: ./override.env
               required: false
+        environment:
+            ADDRESS: ${WG1ADDRESS}
         cap_add:
             - NET_ADMIN
         devices:

scripts/start_wg.sh

@@ -3,16 +3,31 @@ ssh-keygen -A
 exec /usr/sbin/sshd -D -e "$@" &
 
 INTERFACE=$(route | grep '^default' | grep -o '[^ ]*$')
-if [ $(cat /etc/wireguard/wg0.conf | wc -c) -eq 0 ]
+if [ "$HOSTNAME" = "wireguard1" ]
 then
-    PRIVATEKEY=$(wg genkey | tee /etc/wireguard/privatekey)
-    echo "[Interface]" > /etc/wireguard/wg0.conf
-    echo "PrivateKey = $PRIVATEKEY" >> /etc/wireguard/wg0.conf
-    echo "Address = $ADDRESS" >> /etc/wireguard/wg0.conf
-    echo "ListenPort = $WGPORT" >> /etc/wireguard/wg0.conf
+    if [ $(cat /etc/wireguard/wg0.conf | wc -c) -eq 0 ]
+    then
+        PRIVATEKEY=$(wg genkey | tee /etc/wireguard/privatekey)
+        echo "[Interface]" > /etc/wireguard/wg0.conf
+        echo "PrivateKey = $PRIVATEKEY" >> /etc/wireguard/wg0.conf
+        echo "Address = $ADDRESS" >> /etc/wireguard/wg0.conf
+        echo "ListenPort = $WG1PORT" >> /etc/wireguard/wg0.conf
+    else
+        sed "s/ListenPort = [0-9]\+/ListenPort = $WG1PORT/" /etc/wireguard/wg0.conf > change_port
+        cat change_port > /etc/wireguard/wg0.conf
+    fi
 else
-    sed "s/ListenPort = [0-9]\+/ListenPort = $WGPORT/" /etc/wireguard/wg0.conf > change_port
-    cat change_port > /etc/wireguard/wg0.conf
+    if [ $(cat /etc/wireguard/wg0.conf | wc -c) -eq 0 ]
+    then
+        PRIVATEKEY=$(wg genkey | tee /etc/wireguard/privatekey)
+        echo "[Interface]" > /etc/wireguard/wg0.conf
+        echo "PrivateKey = $PRIVATEKEY" >> /etc/wireguard/wg0.conf
+        echo "Address = $ADDRESS" >> /etc/wireguard/wg0.conf
+        echo "ListenPort = $WGPORT" >> /etc/wireguard/wg0.conf
+    else
+        sed "s/ListenPort = [0-9]\+/ListenPort = $WGPORT/" /etc/wireguard/wg0.conf > change_port
+        cat change_port > /etc/wireguard/wg0.conf
+    fi
 fi
 iptables -t nat -A POSTROUTING --destination 10.10.0.5 -j ACCEPT
 iptables -t nat -A POSTROUTING -o $INTERFACE -j MASQUERADE

version

@@ -1,3 +1,8 @@
+07.03.2024 v1.8.8
+- фикс не работающего wireguard
+07.03.2024 v1.8.7
+- фикс порта амнезии
+- у кого ошибка запуска обновите докер и докер композ
 07.03.2024 v1.8.6
 - фикс синхронизации клиентов амнезии, бот падал после рестарта, клиенты пропадали
 - возможность переназначить порты в override.env, файл не отслеживаемый, обновление не будет его сбрасывать