From bbada9111875feb4f1319a7d21874198a83fc71a Mon Sep 17 00:00:00 2001 From: mercury Date: Sat, 19 Aug 2023 19:04:24 +0400 Subject: [PATCH] update iptables rules after restart --- scripts/start_wg.sh | 10 +++++++--- version | 7 +++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/start_wg.sh b/scripts/start_wg.sh index 9afe837..70de477 100644 --- a/scripts/start_wg.sh +++ b/scripts/start_wg.sh @@ -1,16 +1,20 @@ +INTERFACE=$(route | grep '^default' | grep -o '[^ ]*$') if [ $(cat /etc/wireguard/wg0.conf | wc -c) -eq 0 ] then PRIVATEKEY=$(wg genkey | tee /etc/wireguard/privatekey) - INTERFACE=$(route | grep '^default' | grep -o '[^ ]*$') 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 echo "PostUp = iptables -t nat -A POSTROUTING --destination 10.10.0.5 -j ACCEPT;iptables -t nat -A POSTROUTING -o $INTERFACE -j MASQUERADE" >> /etc/wireguard/wg0.conf echo "PostDown = iptables -t nat -D POSTROUTING --destination 10.10.0.5 -j ACCEPT;iptables -t nat -D POSTROUTING -o $INTERFACE -j MASQUERADE" >> /etc/wireguard/wg0.conf +else + sed "s/PostUp.*/PostUp = iptables -t nat -A POSTROUTING --destination 10.10.0.5 -j ACCEPT;iptables -t nat -A POSTROUTING -o $INTERFACE -j MASQUERADE/" /etc/wireguard/wg0.conf > result + sed -i "s/PostDown.*/PostDown = iptables -t nat -D POSTROUTING --destination 10.10.0.5 -j ACCEPT;iptables -t nat -D POSTROUTING -o $INTERFACE -j MASQUERADE/" result + cat result > /etc/wireguard/wg0.conf + sed "s/ListenPort = [0-9]\+/ListenPort = $WGPORT/" /etc/wireguard/wg0.conf > change_port + cat change_port > /etc/wireguard/wg0.conf fi -sed "s/ListenPort = [0-9]\+/ListenPort = $WGPORT/" /etc/wireguard/wg0.conf > change_port -cat change_port > /etc/wireguard/wg0.conf wg-quick up wg0 cat /ssh/key.pub > /root/.ssh/authorized_keys ssh-keygen -A diff --git a/version b/version index a7f9c93..50d7abe 100644 --- a/version +++ b/version @@ -1,3 +1,10 @@ +19.08.2023 показывает в логах и в адгварде реальные айпи пользователей +сделать бэкап +git reset --hard +git pull +импорт бэкапа +make r +сделать новый бэкап 07.08.2023 AdGuardHome v0.107.36 git pull 21.07.2023 уведомления при нажатии кнопки