From 4a39f8ad688498da43446cd4c3a42d0ae85166f0 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 21 Feb 2025 09:09:16 +0500 Subject: [PATCH 01/83] Change ComssDNS --- https-dns-proxy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/https-dns-proxy b/https-dns-proxy index 23f80a7..93e4e7c 100644 --- a/https-dns-proxy +++ b/https-dns-proxy @@ -27,8 +27,8 @@ config https-dns-proxy option listen_port '5055' config https-dns-proxy - option resolver_url 'https://dns.comss.one/dns-query' - option bootstrap_dns '83.220.169.155, 212.109.195.93' + option resolver_url 'https://router.comss.one/dns-query' + option bootstrap_dns '195.133.25.16, 212.109.195.93' option listen_addr '127.0.0.1' option listen_port '5056' From 003026b0137181fe70524f1296af3b43229004b1 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 21 Feb 2025 09:17:59 +0500 Subject: [PATCH 02/83] Fix ComssDNS --- https-dns-proxy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/https-dns-proxy b/https-dns-proxy index 93e4e7c..f546eaa 100644 --- a/https-dns-proxy +++ b/https-dns-proxy @@ -28,7 +28,7 @@ config https-dns-proxy config https-dns-proxy option resolver_url 'https://router.comss.one/dns-query' - option bootstrap_dns '195.133.25.16, 212.109.195.93' + option bootstrap_dns '195.133.25.16,212.109.195.93' option listen_addr '127.0.0.1' option listen_port '5056' From 64720b811a8baa7e906df54fd74aac23511262c5 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 21 Feb 2025 09:36:57 +0500 Subject: [PATCH 03/83] Add block QUIC and add new AI domain --- configure_zaprets.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index 570706c..772bbd3 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -59,6 +59,8 @@ uci add_list dhcp.cfg01411c.server='/*.clashroyale.com/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.brawlstars.com/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.clash.com/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.clashofclans.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.x.ai/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.grok.com /127.0.0.1#5056' uci add dhcp domain # =cfg13f37d uci set dhcp.@domain[-1].name='chatgpt.com' uci set dhcp.@domain[-1].ip='94.131.119.85' @@ -67,6 +69,24 @@ uci set dhcp.@domain[-1].name='openai.com' uci set dhcp.@domain[-1].ip='94.131.119.85' uci commit dhcp +echo "Add block QUIC..." + +uci add firewall rule # =cfg2492bd +uci set firewall.@rule[-1].name='Block_UDP_80' +uci add_list firewall.@rule[-1].proto='udp' +uci set firewall.@rule[-1].src='lan' +uci set firewall.@rule[-1].dest='wan' +uci set firewall.@rule[-1].dest_port='80' +uci set firewall.@rule[-1].target='REJECT' +uci add firewall rule # =cfg2592bd +uci set firewall.@rule[-1].name='Block_UDP_443' +uci add_list firewall.@rule[-1].proto='udp' +uci set firewall.@rule[-1].src='lan' +uci set firewall.@rule[-1].dest='wan' +uci set firewall.@rule[-1].dest_port='443' +uci set firewall.@rule[-1].target='REJECT' +uci commit firewall + echo "Crod task add restart service yotubeUnblock..." cronTask="0 4 * * * service youtubeUnblock restart" From 6fde98ea2682ec3d8d1255f1446d8cc95ed7bed8 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 21 Feb 2025 09:53:08 +0500 Subject: [PATCH 04/83] Fix forward domain Grok --- configure_zaprets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index 772bbd3..cdb01bc 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -60,7 +60,7 @@ uci add_list dhcp.cfg01411c.server='/*.brawlstars.com/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.clash.com/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.clashofclans.com/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.x.ai/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.grok.com /127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.grok.com/127.0.0.1#5056' uci add dhcp domain # =cfg13f37d uci set dhcp.@domain[-1].name='chatgpt.com' uci set dhcp.@domain[-1].ip='94.131.119.85' From 4de28f6b47d5995e8a377a3faec91cdd781f7ba6 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 21 Feb 2025 11:41:07 +0500 Subject: [PATCH 05/83] Fix restart script --- configure_zaprets.sh | 71 ++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 29 deletions(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index cdb01bc..8afce9f 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -13,18 +13,16 @@ opkg update opkg upgrade youtubeUnblock opkg upgrade luci-app-youtubeUnblock -echo "Backup files..." - if [ ! -d "$DIR_BACKUP" ] then + echo "Backup files..." mkdir $DIR_BACKUP + for file in $config_files + do + cp -f "$DIR/$file" "$DIR_BACKUP/$file" + done fi -for file in $config_files -do - cp -f "$DIR/$file" "$DIR_BACKUP/$file" -done - echo "Replace configs..." for file in $config_files @@ -61,31 +59,46 @@ uci add_list dhcp.cfg01411c.server='/*.clash.com/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.clashofclans.com/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.x.ai/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.grok.com/127.0.0.1#5056' -uci add dhcp domain # =cfg13f37d -uci set dhcp.@domain[-1].name='chatgpt.com' -uci set dhcp.@domain[-1].ip='94.131.119.85' -uci add dhcp domain # =cfg14f37d -uci set dhcp.@domain[-1].name='openai.com' -uci set dhcp.@domain[-1].ip='94.131.119.85' uci commit dhcp -echo "Add block QUIC..." +nameRule="option name 'chatgpt.com'" +str=$(grep -i "$nameRule" /etc/config/dhcp) +if [ -z "$str" ] +then + echo "Add unblock ChatGPT..." -uci add firewall rule # =cfg2492bd -uci set firewall.@rule[-1].name='Block_UDP_80' -uci add_list firewall.@rule[-1].proto='udp' -uci set firewall.@rule[-1].src='lan' -uci set firewall.@rule[-1].dest='wan' -uci set firewall.@rule[-1].dest_port='80' -uci set firewall.@rule[-1].target='REJECT' -uci add firewall rule # =cfg2592bd -uci set firewall.@rule[-1].name='Block_UDP_443' -uci add_list firewall.@rule[-1].proto='udp' -uci set firewall.@rule[-1].src='lan' -uci set firewall.@rule[-1].dest='wan' -uci set firewall.@rule[-1].dest_port='443' -uci set firewall.@rule[-1].target='REJECT' -uci commit firewall + uci add dhcp domain # =cfg13f37d + uci set dhcp.@domain[-1].name='chatgpt.com' + uci set dhcp.@domain[-1].ip='94.131.119.85' + uci add dhcp domain # =cfg14f37d + uci set dhcp.@domain[-1].name='openai.com' + uci set dhcp.@domain[-1].ip='94.131.119.85' + uci commit dhcp +fi + +nameRule="option name 'Block_UDP_443'" +str=$(grep -i "$nameRule" /etc/config/firewall) +if [ -z "$str" ] +then + echo "Add block QUIC..." + + uci add firewall rule # =cfg2492bd + uci set firewall.@rule[-1].name='Block_UDP_80' + uci add_list firewall.@rule[-1].proto='udp' + uci set firewall.@rule[-1].src='lan' + uci set firewall.@rule[-1].dest='wan' + uci set firewall.@rule[-1].dest_port='80' + uci set firewall.@rule[-1].target='REJECT' + uci add firewall rule # =cfg2592bd + uci set firewall.@rule[-1].name='Block_UDP_443' + uci add_list firewall.@rule[-1].proto='udp' + uci set firewall.@rule[-1].src='lan' + uci set firewall.@rule[-1].dest='wan' + uci set firewall.@rule[-1].dest_port='443' + uci set firewall.@rule[-1].target='REJECT' + uci commit firewall + service firewall restart +fi echo "Crod task add restart service yotubeUnblock..." From 1eea4ffb8f6b70326349a298772f5628c04941f8 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 21 Feb 2025 16:38:45 +0500 Subject: [PATCH 06/83] Add voice domain ChatGPT --- configure_zaprets.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index 8afce9f..d95fbc4 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -73,6 +73,12 @@ then uci add dhcp domain # =cfg14f37d uci set dhcp.@domain[-1].name='openai.com' uci set dhcp.@domain[-1].ip='94.131.119.85' + uci add dhcp domain # =cfg15f37d + uci set dhcp.@domain[-1].name='webrtc.chatgpt.com' + uci set dhcp.@domain[-1].ip='94.131.119.85' + uci add dhcp domain # =cfg16f37d + uci set dhcp.@domain[-1].name='ios.chat.openai.com' + uci set dhcp.@domain[-1].ip='94.131.119.85' uci commit dhcp fi From 662c205d2dcf22257ebc3f832e20f3d78471d31e Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 21 Feb 2025 16:39:54 +0500 Subject: [PATCH 07/83] Add search domain ChatGPT --- configure_zaprets.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index d95fbc4..98e7861 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -79,6 +79,9 @@ then uci add dhcp domain # =cfg16f37d uci set dhcp.@domain[-1].name='ios.chat.openai.com' uci set dhcp.@domain[-1].ip='94.131.119.85' + uci add dhcp domain # =cfg17f37d + uci set dhcp.@domain[-1].name='searchgpt.com' + uci set dhcp.@domain[-1].ip='94.131.119.85' uci commit dhcp fi From 4826315f096d218e818e30e89f64c56806f861bb Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 21 Feb 2025 17:12:14 +0500 Subject: [PATCH 08/83] Refactoring the system for adding permanent domains --- configure_zaprets.sh | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index 98e7861..82c10f9 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -7,6 +7,20 @@ config_files="dhcp youtubeUnblock https-dns-proxy" +checkAndAddDomainPermanentName() +{ + nameRule="option name '$1'" + str=$(grep -i "$nameRule" /etc/config/dhcp) + if [ -z "$str" ] + then + + uci add dhcp domain + uci set dhcp.@domain[-1].name="$1" + uci set dhcp.@domain[-1].ip="$2" + uci commit dhcp + fi +} + echo "Upgrade packages..." opkg update @@ -61,29 +75,13 @@ uci add_list dhcp.cfg01411c.server='/*.x.ai/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.grok.com/127.0.0.1#5056' uci commit dhcp -nameRule="option name 'chatgpt.com'" -str=$(grep -i "$nameRule" /etc/config/dhcp) -if [ -z "$str" ] -then - echo "Add unblock ChatGPT..." +echo "Add unblock ChatGPT..." - uci add dhcp domain # =cfg13f37d - uci set dhcp.@domain[-1].name='chatgpt.com' - uci set dhcp.@domain[-1].ip='94.131.119.85' - uci add dhcp domain # =cfg14f37d - uci set dhcp.@domain[-1].name='openai.com' - uci set dhcp.@domain[-1].ip='94.131.119.85' - uci add dhcp domain # =cfg15f37d - uci set dhcp.@domain[-1].name='webrtc.chatgpt.com' - uci set dhcp.@domain[-1].ip='94.131.119.85' - uci add dhcp domain # =cfg16f37d - uci set dhcp.@domain[-1].name='ios.chat.openai.com' - uci set dhcp.@domain[-1].ip='94.131.119.85' - uci add dhcp domain # =cfg17f37d - uci set dhcp.@domain[-1].name='searchgpt.com' - uci set dhcp.@domain[-1].ip='94.131.119.85' - uci commit dhcp -fi +checkAndAddDomainPermanentName "chatgpt.com" "94.131.119.85" +checkAndAddDomainPermanentName "openai.com" "94.131.119.85" +checkAndAddDomainPermanentName "webrtc.chatgpt.com" "94.131.119.85" +checkAndAddDomainPermanentName "ios.chat.openai.com" "94.131.119.85" +checkAndAddDomainPermanentName "searchgpt.com" "94.131.119.85" nameRule="option name 'Block_UDP_443'" str=$(grep -i "$nameRule" /etc/config/firewall) From 5ea9486c687b22f47010f68cce67adcd0e615a30 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 21 Feb 2025 20:57:14 +0500 Subject: [PATCH 09/83] Add cron task auto run configure_zaprets --- configure_zaprets.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index 82c10f9..3d17a41 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -107,12 +107,11 @@ then service firewall restart fi -echo "Crod task add restart service yotubeUnblock..." - -cronTask="0 4 * * * service youtubeUnblock restart" -str=$(grep -i "0 4 \* \* \* service youtubeUnblock restart" /etc/crontabs/root) +cronTask="0 4 * * * wget -O - https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main/configure_zaprets.sh | sh" +str=$(grep -i "0 4 \* \* \* wget -O - https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main/configure_zaprets.sh | sh" /etc/crontabs/root) if [ -z "$str" ] then + echo "Add cron task auto run configure_zapret..." echo "$cronTask" >> /etc/crontabs/root fi From 1aa929cbf148830f8d865f9c85d1a54d3496d5a2 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 21 Feb 2025 22:09:02 +0500 Subject: [PATCH 10/83] Delete cron task auto run script --- off_configure_zaprets.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/off_configure_zaprets.sh b/off_configure_zaprets.sh index 8825da5..66e7295 100644 --- a/off_configure_zaprets.sh +++ b/off_configure_zaprets.sh @@ -1,5 +1,6 @@ #!/bin/sh +URL_REPO="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs" DIR="/etc/config" DIR_BACKUP="/root/backup" config_files="dhcp @@ -20,4 +21,10 @@ service https-dns-proxy restart service dnsmasq restart service odhcpd restart +echo "Remove cron task auto run script configure zaprets.." + +grep -v "0 4 \* \* \* wget -O - $URL_REPO/refs/heads/main/configure_zaprets.sh | sh" /etc/crontabs/root > /etc/crontabs/temp +cp -f "/etc/crontabs/temp" "/etc/crontabs/root" +rm -f "/etc/crontabs/temp" + echo "Off configure complete..." From 03228656011337268ddc62ef6bd9aae9b973da6c Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 21 Feb 2025 22:11:45 +0500 Subject: [PATCH 11/83] Add variable URL_REPO --- configure_zaprets.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index 3d17a41..b700046 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -1,6 +1,7 @@ #!/bin/sh -URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" +URL_REPO="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs" +URL="$URL_REPO/refs/heads/main" DIR="/etc/config" DIR_BACKUP="/root/backup" config_files="dhcp @@ -107,8 +108,8 @@ then service firewall restart fi -cronTask="0 4 * * * wget -O - https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main/configure_zaprets.sh | sh" -str=$(grep -i "0 4 \* \* \* wget -O - https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main/configure_zaprets.sh | sh" /etc/crontabs/root) +cronTask="0 4 * * * wget -O - $URL_REPO/refs/heads/main/configure_zaprets.sh | sh" +str=$(grep -i "0 4 \* \* \* wget -O - $URL_REPO/refs/heads/main/configure_zaprets.sh | sh" /etc/crontabs/root) if [ -z "$str" ] then echo "Add cron task auto run configure_zapret..." From 415b9f121f1c3bcda6b5e7f414c158f588d25ce5 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 21 Feb 2025 23:15:26 +0500 Subject: [PATCH 12/83] Delete variable URL_REPO --- configure_zaprets.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index b700046..58d9d9e 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -1,7 +1,6 @@ #!/bin/sh -URL_REPO="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs" -URL="$URL_REPO/refs/heads/main" +URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" DIR="/etc/config" DIR_BACKUP="/root/backup" config_files="dhcp @@ -108,8 +107,8 @@ then service firewall restart fi -cronTask="0 4 * * * wget -O - $URL_REPO/refs/heads/main/configure_zaprets.sh | sh" -str=$(grep -i "0 4 \* \* \* wget -O - $URL_REPO/refs/heads/main/configure_zaprets.sh | sh" /etc/crontabs/root) +cronTask="0 4 * * * wget -O - $URL/configure_zaprets.sh | sh" +str=$(grep -i "0 4 \* \* \* wget -O - $URL/configure_zaprets.sh | sh" /etc/crontabs/root) if [ -z "$str" ] then echo "Add cron task auto run configure_zapret..." From 66f2fa6fa19397aba836b6d07d82299406e67cea Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 21 Feb 2025 23:26:06 +0500 Subject: [PATCH 13/83] Delete folder backup --- off_configure_zaprets.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/off_configure_zaprets.sh b/off_configure_zaprets.sh index 66e7295..a4f5953 100644 --- a/off_configure_zaprets.sh +++ b/off_configure_zaprets.sh @@ -1,6 +1,6 @@ #!/bin/sh -URL_REPO="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs" +URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" DIR="/etc/config" DIR_BACKUP="/root/backup" config_files="dhcp @@ -14,6 +14,8 @@ do cp -f "$DIR_BACKUP/$file" "$DIR/$file" done +rm -rf "$DIR_BACKUP" + echo "Restart service..." service youtubeUnblock restart @@ -23,7 +25,7 @@ service odhcpd restart echo "Remove cron task auto run script configure zaprets.." -grep -v "0 4 \* \* \* wget -O - $URL_REPO/refs/heads/main/configure_zaprets.sh | sh" /etc/crontabs/root > /etc/crontabs/temp +grep -v "0 4 \* \* \* wget -O - $URL/configure_zaprets.sh | sh" /etc/crontabs/root > /etc/crontabs/temp cp -f "/etc/crontabs/temp" "/etc/crontabs/root" rm -f "/etc/crontabs/temp" From c476695cdde0bd4287a21b5fc56c6e8346bf4761 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Sat, 22 Feb 2025 00:39:32 +0500 Subject: [PATCH 14/83] Edit url repo --- off_configure_zaprets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/off_configure_zaprets.sh b/off_configure_zaprets.sh index a4f5953..2b6b8c5 100644 --- a/off_configure_zaprets.sh +++ b/off_configure_zaprets.sh @@ -1,6 +1,6 @@ #!/bin/sh -URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" +URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main" DIR="/etc/config" DIR_BACKUP="/root/backup" config_files="dhcp From 1dade9383aaecfec403297213ed7afba38ad4c49 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Sat, 22 Feb 2025 00:41:20 +0500 Subject: [PATCH 15/83] Edit url repo --- configure_zaprets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index 14d8f3c..58d9d9e 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -1,6 +1,6 @@ #!/bin/sh -URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main" +URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" DIR="/etc/config" DIR_BACKUP="/root/backup" config_files="dhcp From bd40446e4e8dffbc855d0446dec4166de55e6583 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Sat, 22 Feb 2025 18:23:24 +0500 Subject: [PATCH 16/83] Refactoring the dns redirection system --- configure_zaprets.sh | 57 +++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index 58d9d9e..efa673d 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -21,6 +21,18 @@ checkAndAddDomainPermanentName() fi } +checkAndAddDomainDnsRedirection() +{ + nameRule="option name '$1'" + str=$(grep -i "$nameRule" /etc/config/dhcp) + if [ -z "$str" ] + then + + uci add_list dhcp.cfg01411c.server="$1" + uci commit dhcp + fi +} + echo "Upgrade packages..." opkg update @@ -51,30 +63,31 @@ echo "Configure dhcp..." uci set dhcp.cfg01411c.strictorder='1' uci set dhcp.cfg01411c.filter_aaaa='1' -uci del dhcp.cfg01411c.server -uci add_list dhcp.cfg01411c.server='127.0.0.1#5053' -uci add_list dhcp.cfg01411c.server='127.0.0.1#5054' -uci add_list dhcp.cfg01411c.server='127.0.0.1#5055' -uci add_list dhcp.cfg01411c.server='127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.chatgpt.com/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.oaistatic.com/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.oaiusercontent.com/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.openai.com/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.microsoft.com/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.windowsupdate.com/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.bing.com/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.supercell.com/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.seeurlpcl.com/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.supercellid.com/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.supercellgames.com/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.clashroyale.com/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.brawlstars.com/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.clash.com/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.clashofclans.com/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.x.ai/127.0.0.1#5056' -uci add_list dhcp.cfg01411c.server='/*.grok.com/127.0.0.1#5056' uci commit dhcp +checkAndAddDomainDnsRedirection "127.0.0.1#5053" +checkAndAddDomainDnsRedirection "127.0.0.1#5054" +checkAndAddDomainDnsRedirection "127.0.0.1#5055" +checkAndAddDomainDnsRedirection "127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.chatgpt.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.oaistatic.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.oaiusercontent.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.openai.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.microsoft.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.windowsupdate.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.bing.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.supercell.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.seeurlpcl.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.supercellid.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.supercellgames.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.clashroyale.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.brawlstars.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.clash.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.clashofclans.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.x.ai/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.grok.com/127.0.0.1#5056" +checkAndAddDomainDnsRedirection "/*.gitgub.com/127.0.0.1#5056" + echo "Add unblock ChatGPT..." checkAndAddDomainPermanentName "chatgpt.com" "94.131.119.85" From f56ad6219d52be2a3cc0ad279e7ad7a97024c4e5 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Sat, 22 Feb 2025 18:45:07 +0500 Subject: [PATCH 17/83] Fix refactoring the dns redirection system and add Gitgub redirection DNS --- configure_zaprets.sh | 57 +++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 35 deletions(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index efa673d..c4ca82a 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -21,18 +21,6 @@ checkAndAddDomainPermanentName() fi } -checkAndAddDomainDnsRedirection() -{ - nameRule="option name '$1'" - str=$(grep -i "$nameRule" /etc/config/dhcp) - if [ -z "$str" ] - then - - uci add_list dhcp.cfg01411c.server="$1" - uci commit dhcp - fi -} - echo "Upgrade packages..." opkg update @@ -63,31 +51,30 @@ echo "Configure dhcp..." uci set dhcp.cfg01411c.strictorder='1' uci set dhcp.cfg01411c.filter_aaaa='1' +uci add_list dhcp.cfg01411c.server='127.0.0.1#5053' +uci add_list dhcp.cfg01411c.server='127.0.0.1#5054' +uci add_list dhcp.cfg01411c.server='127.0.0.1#5055' +uci add_list dhcp.cfg01411c.server='127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.chatgpt.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.oaistatic.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.oaiusercontent.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.openai.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.microsoft.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.windowsupdate.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.bing.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.supercell.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.seeurlpcl.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.supercellid.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.supercellgames.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.clashroyale.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.brawlstars.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.clash.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.clashofclans.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.x.ai/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.grok.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.github.com/127.0.0.1#5056' uci commit dhcp -checkAndAddDomainDnsRedirection "127.0.0.1#5053" -checkAndAddDomainDnsRedirection "127.0.0.1#5054" -checkAndAddDomainDnsRedirection "127.0.0.1#5055" -checkAndAddDomainDnsRedirection "127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.chatgpt.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.oaistatic.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.oaiusercontent.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.openai.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.microsoft.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.windowsupdate.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.bing.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.supercell.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.seeurlpcl.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.supercellid.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.supercellgames.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.clashroyale.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.brawlstars.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.clash.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.clashofclans.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.x.ai/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.grok.com/127.0.0.1#5056" -checkAndAddDomainDnsRedirection "/*.gitgub.com/127.0.0.1#5056" - echo "Add unblock ChatGPT..." checkAndAddDomainPermanentName "chatgpt.com" "94.131.119.85" From 930715fde09a5227d366430db1916468980ffc1d Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Sat, 22 Feb 2025 22:40:30 +0500 Subject: [PATCH 18/83] Change Repo URL --- configure_zaprets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index c4ca82a..f23fdae 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -1,6 +1,6 @@ #!/bin/sh -URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" +URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main" DIR="/etc/config" DIR_BACKUP="/root/backup" config_files="dhcp From a7d02c633395d19dec76ecdf63f54ea89a601f30 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Sun, 23 Feb 2025 20:27:45 +0500 Subject: [PATCH 19/83] Add domain Xbox DNS Redirect --- configure_zaprets.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index c4ca82a..4106f41 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -73,6 +73,33 @@ uci add_list dhcp.cfg01411c.server='/*.clashofclans.com/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.x.ai/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.grok.com/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.github.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.forzamotorsport.net/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.forzaracingchampionship.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.forzarc.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.gamepass.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.orithegame.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.renovacionxboxlive.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.tellmewhygame.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xbox.co/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xbox.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xbox.eu/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xbox.org/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xbox360.co/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xbox360.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xbox360.eu/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xbox360.org/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xboxab.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xboxgamepass.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xboxgamestudios.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xboxlive.cn/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xboxlive.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xboxone.co/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xboxone.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xboxone.eu/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xboxplayanywhere.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xboxservices.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xboxstudios.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.xbx.lv/127.0.0.1#5056' uci commit dhcp echo "Add unblock ChatGPT..." From 4b5ff5eb01cad58ef2f593acde35bdfec799c5dc Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Sun, 23 Feb 2025 21:07:34 +0500 Subject: [PATCH 20/83] Add domain BrawlStars DNS Redirect --- configure_zaprets.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index 4106f41..d03d908 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -100,6 +100,11 @@ uci add_list dhcp.cfg01411c.server='/*.xboxplayanywhere.com/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.xboxservices.com/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.xboxstudios.com/127.0.0.1#5056' uci add_list dhcp.cfg01411c.server='/*.xbx.lv/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.sentry.io/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.usercentrics.eu/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.recaptcha.net/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.gstatic.com/127.0.0.1#5056' +uci add_list dhcp.cfg01411c.server='/*.brawlstarsgame.com/127.0.0.1#5056' uci commit dhcp echo "Add unblock ChatGPT..." From bb81456616b4340b5cbdd7c4432c050595bc1e5c Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Mon, 24 Feb 2025 17:15:29 +0500 Subject: [PATCH 21/83] Add files via upload --- awg_config.sh | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 awg_config.sh diff --git a/awg_config.sh b/awg_config.sh new file mode 100644 index 0000000..7f59bde --- /dev/null +++ b/awg_config.sh @@ -0,0 +1,135 @@ +#!/bin/sh + +#запрос конфигурации WARP +result=$(curl 'https://warp.llimonix.pw/api/warp' \ + -H 'Accept: */*' \ + -H 'Accept-Language: ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7' \ + -H 'Connection: keep-alive' \ + -H 'Content-Type: application/json' \ + -H 'Origin: https://warp.llimonix.pw' \ + -H 'Referer: https://warp.llimonix.pw/' \ + -H 'Sec-Fetch-Dest: empty' \ + -H 'Sec-Fetch-Mode: cors' \ + -H 'Sec-Fetch-Site: same-origin' \ + -H 'User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36' \ + -H 'sec-ch-ua: "Not(A:Brand";v="99", "Google Chrome";v="133", "Chromium";v="133")' \ + -H 'sec-ch-ua-mobile: ?0' \ + -H 'sec-ch-ua-platform: "Windows"' \ + --data-raw '{"selectedServices":[],"siteMode":"all","deviceType":"computer"}') + +#проверяем установлени ли библиотека jq +test_json=$(echo "{ }" | jq) +if [ "$test_json" != "{}" ]; then + echo "jq not installed" + opkg update + opkg install jq +fi + +#парсим результат запроса конфигурации WARP +content=$(echo $result | jq '.content') +configBase64=$(echo $content | jq -r '.configBase64') +#echo "$result" +warp_config=$(echo "$configBase64" | base64 -d) +#echo "$warp_config" +while IFS=' = ' read -r line; do + if echo "$line" | grep -q "="; then + # Разделяем строку по первому вхождению "=" + key=$(echo "$line" | cut -d'=' -f1 | xargs) # Убираем пробелы + value=$(echo "$line" | cut -d'=' -f2- | xargs) # Убираем пробелы + eval "$key=\"$value\"" + fi +done < <(echo "$warp_config") + +Address=$(echo "$Address" | cut -d',' -f1) +DNS=$(echo "$DNS" | cut -d',' -f1) +AllowedIPs=$(echo "$AllowedIPs" | cut -d',' -f1) +EndpointIP=$(echo "$Endpoint" | cut -d':' -f1) +EndpointPort=$(echo "$Endpoint" | cut -d':' -f2) + +#выводим результат +echo "PrivateKey: $PrivateKey" +echo "S1: $S1" +echo "S2: $S2" +echo "Jc: $Jc" +echo "Jmin: $Jmin" +echo "Jmax: $Jmax" +echo "H1: $H1" +echo "H2: $H2" +echo "H3: $H3" +echo "H4: $H4" +echo "MTU: $MTU" +echo "Address: $Address" +echo "DNS: $DNS" +echo "PublicKey: $PublicKey" +echo "AllowedIPs: $AllowedIPs" +echo "Endpoint: $Endpoint" +echo "EndpointIP: $EndpointIP" +echo "EndpointPort: $EndpointPort" + + +INTERFACE_NAME="awg_route0" +CONFIG_NAME="amneziawg_awg_route0" +PROTO="amneziawg" +ZONE_NAME="awg" + +uci set network.${INTERFACE_NAME}=interface +uci set network.${INTERFACE_NAME}.proto=$PROTO +uci set network.${INTERFACE_NAME}.private_key=$PrivateKey +uci set network.${INTERFACE_NAME}.listen_port='51821' +uci set network.${INTERFACE_NAME}.addresses=$Address +uci set network.${INTERFACE_NAME}.awg_jc=$Jc +uci set network.${INTERFACE_NAME}.awg_jmin=$Jmin +uci set network.${INTERFACE_NAME}.awg_jmax=$Jmax +uci set network.${INTERFACE_NAME}.awg_s1=$S1 +uci set network.${INTERFACE_NAME}.awg_s2=$S2 +uci set network.${INTERFACE_NAME}.awg_h1=$H1 +uci set network.${INTERFACE_NAME}.awg_h2=$H2 +uci set network.${INTERFACE_NAME}.awg_h3=$H3 +uci set network.${INTERFACE_NAME}.awg_h4=$H4 +uci set network.${INTERFACE_NAME}.mtu=$MTU + +if ! uci show network | grep -q ${CONFIG_NAME}; then + uci add network ${CONFIG_NAME} +fi + +uci set network.@${CONFIG_NAME}[0]=$CONFIG_NAME +uci set network.@${CONFIG_NAME}[0].name="${INTERFACE_NAME}_client" +uci set network.@${CONFIG_NAME}[0].public_key=$PublicKey +uci set network.@${CONFIG_NAME}[0].route_allowed_ips='0' +uci set network.@${CONFIG_NAME}[0].persistent_keepalive='25' +uci set network.@${CONFIG_NAME}[0].endpoint_host=$EndpointIP +uci set network.@${CONFIG_NAME}[0].allowed_ips='0.0.0.0/0' +uci set network.@${CONFIG_NAME}[0].endpoint_port=$EndpointPort +uci commit network + +if ! uci show firewall | grep -q "@zone.*name='${ZONE_NAME}'"; then + printf "\033[32;1mZone Create\033[0m\n" + uci add firewall zone + uci set firewall.@zone[-1].name=$ZONE_NAME + uci set firewall.@zone[-1].network=$INTERFACE_NAME + uci set firewall.@zone[-1].forward='REJECT' + uci set firewall.@zone[-1].output='ACCEPT' + uci set firewall.@zone[-1].input='REJECT' + uci set firewall.@zone[-1].masq='1' + uci set firewall.@zone[-1].mtu_fix='1' + uci set firewall.@zone[-1].family='ipv4' + uci commit firewall +fi + +if ! uci show firewall | grep -q "@forwarding.*name='${ZONE_NAME}'"; then + printf "\033[32;1mConfigured forwarding\033[0m\n" + uci add firewall forwarding + uci set firewall.@forwarding[-1]=forwarding + uci set firewall.@forwarding[-1].name="${ZONE_NAME}-lan" + uci set firewall.@forwarding[-1].dest=${ZONE_NAME} + uci set firewall.@forwarding[-1].src='lan' + uci set firewall.@forwarding[-1].family='ipv4' + uci commit firewall +fi + +service firewall restart +service network restart + + +#opkg remove luci-app-podkop podkop luci-i18n-podkop-ru +#wget --no-check-certificate -O /tmp/autoinstall.sh https://raw.githubusercontent.com/CodeRoK7/podkop-v0.2.5/refs/heads/main/install.sh && chmod +x /tmp/autoinstall.sh && printf '%s\n' 2 2 Y Y Y | /tmp/autoinstall.sh \ No newline at end of file From 2565dd3de48b6b2d3e35ae6ad19600ce65b01b5f Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Tue, 25 Feb 2025 09:13:46 +0500 Subject: [PATCH 22/83] Add install Podkop and disable youtubeunblock --- awg_config.sh | 103 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 79 insertions(+), 24 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index 7f59bde..32dbd91 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -17,14 +17,35 @@ result=$(curl 'https://warp.llimonix.pw/api/warp' \ -H 'sec-ch-ua-platform: "Windows"' \ --data-raw '{"selectedServices":[],"siteMode":"all","deviceType":"computer"}') +echo "opkg update" +opkg update + #проверяем установлени ли библиотека jq test_json=$(echo "{ }" | jq) if [ "$test_json" != "{}" ]; then echo "jq not installed" - opkg update opkg install jq fi +#проверяем установлени ли пакет dnsmasq-full +if opkg list-installed | grep -q dnsmasq-full; then + echo "dnsmasq-full already installed" +else + echo "Installed dnsmasq-full" + cd /tmp/ && opkg download dnsmasq-full + opkg remove dnsmasq && opkg install dnsmasq-full --cache /tmp/ + + [ -f /etc/config/dhcp-opkg ] && cp /etc/config/dhcp /etc/config/dhcp-old && mv /etc/config/dhcp-opkg /etc/config/dhcp +fi + +#проверяем установлени ли пакет coreutils-base64 +if opkg list-installed | grep -q coreutils-base64; then + echo "coreutils-base64 already installed" +else + echo "Installed coreutils-base64" + opkg install coreutils-base64 +fi + #парсим результат запроса конфигурации WARP content=$(echo $result | jq '.content') configBase64=$(echo $content | jq -r '.configBase64') @@ -40,6 +61,7 @@ while IFS=' = ' read -r line; do fi done < <(echo "$warp_config") +#вытаскиваем нужные нам данные из распарсинного ответа Address=$(echo "$Address" | cut -d',' -f1) DNS=$(echo "$DNS" | cut -d',' -f1) AllowedIPs=$(echo "$AllowedIPs" | cut -d',' -f1) @@ -47,28 +69,29 @@ EndpointIP=$(echo "$Endpoint" | cut -d':' -f1) EndpointPort=$(echo "$Endpoint" | cut -d':' -f2) #выводим результат -echo "PrivateKey: $PrivateKey" -echo "S1: $S1" -echo "S2: $S2" -echo "Jc: $Jc" -echo "Jmin: $Jmin" -echo "Jmax: $Jmax" -echo "H1: $H1" -echo "H2: $H2" -echo "H3: $H3" -echo "H4: $H4" -echo "MTU: $MTU" -echo "Address: $Address" -echo "DNS: $DNS" -echo "PublicKey: $PublicKey" -echo "AllowedIPs: $AllowedIPs" -echo "Endpoint: $Endpoint" -echo "EndpointIP: $EndpointIP" -echo "EndpointPort: $EndpointPort" +# echo "PrivateKey: $PrivateKey" +# echo "S1: $S1" +# echo "S2: $S2" +# echo "Jc: $Jc" +# echo "Jmin: $Jmin" +# echo "Jmax: $Jmax" +# echo "H1: $H1" +# echo "H2: $H2" +# echo "H3: $H3" +# echo "H4: $H4" +# echo "MTU: $MTU" +# echo "Address: $Address" +# echo "DNS: $DNS" +# echo "PublicKey: $PublicKey" +# echo "AllowedIPs: $AllowedIPs" +# echo "Endpoint: $Endpoint" +# echo "EndpointIP: $EndpointIP" +# echo "EndpointPort: $EndpointPort" +#задаём имя интерфейса INTERFACE_NAME="awg_route0" -CONFIG_NAME="amneziawg_awg_route0" +CONFIG_NAME="amnezia_route0" PROTO="amneziawg" ZONE_NAME="awg" @@ -90,6 +113,7 @@ uci set network.${INTERFACE_NAME}.mtu=$MTU if ! uci show network | grep -q ${CONFIG_NAME}; then uci add network ${CONFIG_NAME} + echo "add awg0" fi uci set network.@${CONFIG_NAME}[0]=$CONFIG_NAME @@ -127,9 +151,40 @@ if ! uci show firewall | grep -q "@forwarding.*name='${ZONE_NAME}'"; then uci commit firewall fi + +printf "\033[32;1mInstall and configure PODKOP (a tool for point routing of traffic)?? (y/n): \033[0m\n" +read is_install_podkop + +if [ "$is_install_podkop" = "y" ] || [ "$is_install_podkop" = "Y" ]; then + DOWNLOAD_DIR="/tmp/podkop" + mkdir -p "$DOWNLOAD_DIR" + REPO="https://api.github.com/repos/itdoginfo/podkop/releases/tags/v0.2.5" + wget -qO- "$REPO" | grep -o 'https://[^"]*\.ipk' | while read -r url; do + filename=$(basename "$url") + echo "Download $filename..." + wget -q -O "$DOWNLOAD_DIR/$filename" "$url" + done + opkg install $DOWNLOAD_DIR/podkop*.ipk + opkg install $DOWNLOAD_DIR/luci-app-podkop*.ipk + opkg install $DOWNLOAD_DIR/luci-i18n-podkop-ru*.ipk + rm -f $DOWNLOAD_DIR/podkop*.ipk $DOWNLOAD_DIR/luci-app-podkop*.ipk $DOWNLOAD_DIR/luci-i18n-podkop-ru*.ipk + + uci set podkop.main.mode='vpn' + uci set podkop.main.interface="$INTERFACE_NAME" + uci set podkop.main.domain_list_enabled='1' + uci set podkop.main.domain_list='ru_inside' + uci set podkop.main.delist_domains_enabled='0' + uci add_list podkop.main.subnets='meta' + uci add_list podkop.main.subnets='twitter' + uci add_list podkop.main.subnets='discord' + uci commit podkop +fi + + +echo "Stop and disabled service 'youtubeUnblock'..." +service youtubeUnblock stop +service youtubeUnblock disable + +echo "Configured completed...\nRestart network..." service firewall restart service network restart - - -#opkg remove luci-app-podkop podkop luci-i18n-podkop-ru -#wget --no-check-certificate -O /tmp/autoinstall.sh https://raw.githubusercontent.com/CodeRoK7/podkop-v0.2.5/refs/heads/main/install.sh && chmod +x /tmp/autoinstall.sh && printf '%s\n' 2 2 Y Y Y | /tmp/autoinstall.sh \ No newline at end of file From ae863b7bf7e632e027f868d9cb46539d09625616 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Tue, 25 Feb 2025 09:25:51 +0500 Subject: [PATCH 23/83] Print hints and clear code --- awg_config.sh | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index 32dbd91..ad1c0d7 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -68,26 +68,7 @@ AllowedIPs=$(echo "$AllowedIPs" | cut -d',' -f1) EndpointIP=$(echo "$Endpoint" | cut -d':' -f1) EndpointPort=$(echo "$Endpoint" | cut -d':' -f2) -#выводим результат -# echo "PrivateKey: $PrivateKey" -# echo "S1: $S1" -# echo "S2: $S2" -# echo "Jc: $Jc" -# echo "Jmin: $Jmin" -# echo "Jmax: $Jmax" -# echo "H1: $H1" -# echo "H2: $H2" -# echo "H3: $H3" -# echo "H4: $H4" -# echo "MTU: $MTU" -# echo "Address: $Address" -# echo "DNS: $DNS" -# echo "PublicKey: $PublicKey" -# echo "AllowedIPs: $AllowedIPs" -# echo "Endpoint: $Endpoint" -# echo "EndpointIP: $EndpointIP" -# echo "EndpointPort: $EndpointPort" - +echo "Create and configure tunnel AmneziaWG WARP..." #задаём имя интерфейса INTERFACE_NAME="awg_route0" @@ -113,7 +94,7 @@ uci set network.${INTERFACE_NAME}.mtu=$MTU if ! uci show network | grep -q ${CONFIG_NAME}; then uci add network ${CONFIG_NAME} - echo "add awg0" + echo "add $INTERFACE_NAME" fi uci set network.@${CONFIG_NAME}[0]=$CONFIG_NAME @@ -181,10 +162,10 @@ if [ "$is_install_podkop" = "y" ] || [ "$is_install_podkop" = "Y" ]; then fi -echo "Stop and disabled service 'youtubeUnblock'..." +printf "\033[32;1mStop and disabled service 'youtubeUnblock'...\033[0m\n" service youtubeUnblock stop service youtubeUnblock disable -echo "Configured completed...\nRestart network..." +printf "Configured completed...\n\033[32;1mRestart network...\033[0m\n" service firewall restart service network restart From c83ada7af59db55da926702c70a15784feedab73 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Tue, 25 Feb 2025 10:19:35 +0500 Subject: [PATCH 24/83] Add files via upload --- podkop | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 podkop diff --git a/podkop b/podkop new file mode 100644 index 0000000..1baa571 --- /dev/null +++ b/podkop @@ -0,0 +1,26 @@ + +config main 'main' + option mode 'vpn' + option domain_list_enabled '1' + option subnets_list_enabled '1' + option custom_domains_list_enabled 'disabled' + option custom_subnets_list_enabled 'disabled' + option all_traffic_from_ip_enabled '0' + option custom_download_domains_list_enabled '0' + option custom_download_subnets_list_enabled '0' + option exclude_from_ip_enabled '0' + option exclude_ntp '1' + option update_interval '0 4 * * *' + option custom_local_domains_list_enabled '0' + option interface 'awg_route0' + option domain_list 'ru_inside' + option delist_domains_enabled '0' + list subnets 'meta' + list subnets 'twitter' + list subnets 'discord' + +config second 'second' + option second_enable '0' + option domain_list_enabled '0' + list domains 'youtube' + From 7efb5838d910b6903ff48c4e125e880e3dfec3ab Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Tue, 25 Feb 2025 11:03:59 +0500 Subject: [PATCH 25/83] Check installed packeds and check podkop and configured --- awg_config.sh | 232 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 177 insertions(+), 55 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index ad1c0d7..5a75383 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -1,5 +1,139 @@ #!/bin/sh +install_awg_packages() { + # Получение pkgarch с наибольшим приоритетом + PKGARCH=$(opkg print-architecture | awk 'BEGIN {max=0} {if ($3 > max) {max = $3; arch = $2}} END {print arch}') + + TARGET=$(ubus call system board | jsonfilter -e '@.release.target' | cut -d '/' -f 1) + SUBTARGET=$(ubus call system board | jsonfilter -e '@.release.target' | cut -d '/' -f 2) + VERSION=$(ubus call system board | jsonfilter -e '@.release.version') + PKGPOSTFIX="_v${VERSION}_${PKGARCH}_${TARGET}_${SUBTARGET}.ipk" + BASE_URL="https://github.com/Slava-Shchipunov/awg-openwrt/releases/download/" + + AWG_DIR="/tmp/amneziawg" + mkdir -p "$AWG_DIR" + + if opkg list-installed | grep -q kmod-amneziawg; then + echo "kmod-amneziawg already installed" + else + KMOD_AMNEZIAWG_FILENAME="kmod-amneziawg${PKGPOSTFIX}" + DOWNLOAD_URL="${BASE_URL}v${VERSION}/${KMOD_AMNEZIAWG_FILENAME}" + wget -O "$AWG_DIR/$KMOD_AMNEZIAWG_FILENAME" "$DOWNLOAD_URL" + + if [ $? -eq 0 ]; then + echo "kmod-amneziawg file downloaded successfully" + else + echo "Error downloading kmod-amneziawg. Please, install kmod-amneziawg manually and run the script again" + exit 1 + fi + + opkg install "$AWG_DIR/$KMOD_AMNEZIAWG_FILENAME" + + if [ $? -eq 0 ]; then + echo "kmod-amneziawg file downloaded successfully" + else + echo "Error installing kmod-amneziawg. Please, install kmod-amneziawg manually and run the script again" + exit 1 + fi + fi + + if opkg list-installed | grep -q amneziawg-tools; then + echo "amneziawg-tools already installed" + else + AMNEZIAWG_TOOLS_FILENAME="amneziawg-tools${PKGPOSTFIX}" + DOWNLOAD_URL="${BASE_URL}v${VERSION}/${AMNEZIAWG_TOOLS_FILENAME}" + wget -O "$AWG_DIR/$AMNEZIAWG_TOOLS_FILENAME" "$DOWNLOAD_URL" + + if [ $? -eq 0 ]; then + echo "amneziawg-tools file downloaded successfully" + else + echo "Error downloading amneziawg-tools. Please, install amneziawg-tools manually and run the script again" + exit 1 + fi + + opkg install "$AWG_DIR/$AMNEZIAWG_TOOLS_FILENAME" + + if [ $? -eq 0 ]; then + echo "amneziawg-tools file downloaded successfully" + else + echo "Error installing amneziawg-tools. Please, install amneziawg-tools manually and run the script again" + exit 1 + fi + fi + + if opkg list-installed | grep -q luci-app-amneziawg; then + echo "luci-app-amneziawg already installed" + else + LUCI_APP_AMNEZIAWG_FILENAME="luci-app-amneziawg${PKGPOSTFIX}" + DOWNLOAD_URL="${BASE_URL}v${VERSION}/${LUCI_APP_AMNEZIAWG_FILENAME}" + wget -O "$AWG_DIR/$LUCI_APP_AMNEZIAWG_FILENAME" "$DOWNLOAD_URL" + + if [ $? -eq 0 ]; then + echo "luci-app-amneziawg file downloaded successfully" + else + echo "Error downloading luci-app-amneziawg. Please, install luci-app-amneziawg manually and run the script again" + exit 1 + fi + + opkg install "$AWG_DIR/$LUCI_APP_AMNEZIAWG_FILENAME" + + if [ $? -eq 0 ]; then + echo "luci-app-amneziawg file downloaded successfully" + else + echo "Error installing luci-app-amneziawg. Please, install luci-app-amneziawg manually and run the script again" + exit 1 + fi + fi + + rm -rf "$AWG_DIR" +} + +echo "opkg update" +opkg update + +#проверка и установка пакетов AmneziaWG +install_awg_packages + +#проверяем установлени ли библиотека jq +if opkg list-installed | grep -q jq; then + echo "jq already installed..." +else + echo "jq not installed. Installed jq..." + opkg install jq + if [ $? -eq 0 ]; then + echo "jq file downloaded successfully" + else + echo "Error installing jq. Please, install jq manually and run the script again" + exit 1 + fi +fi + +#проверяем установлени ли пакет dnsmasq-full +if opkg list-installed | grep -q dnsmasq-full; then + echo "dnsmasq-full already installed..." +else + echo "Installed dnsmasq-full..." + cd /tmp/ && opkg download dnsmasq-full + opkg remove dnsmasq && opkg install dnsmasq-full --cache /tmp/ + + [ -f /etc/config/dhcp-opkg ] && cp /etc/config/dhcp /etc/config/dhcp-old && mv /etc/config/dhcp-opkg /etc/config/dhcp +fi + +#проверяем установлени ли пакет coreutils-base64 +if opkg list-installed | grep -q coreutils-base64; then + echo "coreutils-base64 already installed..." +else + echo "Installed coreutils-base64" + opkg install coreutils-base64 + if [ $? -eq 0 ]; then + echo "coreutils-base64 file downloaded successfully" + else + echo "Error installing coreutils-base64. Please, install coreutils-base64 manually and run the script again" + exit 1 + fi +fi + + #запрос конфигурации WARP result=$(curl 'https://warp.llimonix.pw/api/warp' \ -H 'Accept: */*' \ @@ -17,34 +151,6 @@ result=$(curl 'https://warp.llimonix.pw/api/warp' \ -H 'sec-ch-ua-platform: "Windows"' \ --data-raw '{"selectedServices":[],"siteMode":"all","deviceType":"computer"}') -echo "opkg update" -opkg update - -#проверяем установлени ли библиотека jq -test_json=$(echo "{ }" | jq) -if [ "$test_json" != "{}" ]; then - echo "jq not installed" - opkg install jq -fi - -#проверяем установлени ли пакет dnsmasq-full -if opkg list-installed | grep -q dnsmasq-full; then - echo "dnsmasq-full already installed" -else - echo "Installed dnsmasq-full" - cd /tmp/ && opkg download dnsmasq-full - opkg remove dnsmasq && opkg install dnsmasq-full --cache /tmp/ - - [ -f /etc/config/dhcp-opkg ] && cp /etc/config/dhcp /etc/config/dhcp-old && mv /etc/config/dhcp-opkg /etc/config/dhcp -fi - -#проверяем установлени ли пакет coreutils-base64 -if opkg list-installed | grep -q coreutils-base64; then - echo "coreutils-base64 already installed" -else - echo "Installed coreutils-base64" - opkg install coreutils-base64 -fi #парсим результат запроса конфигурации WARP content=$(echo $result | jq '.content') @@ -132,37 +238,53 @@ if ! uci show firewall | grep -q "@forwarding.*name='${ZONE_NAME}'"; then uci commit firewall fi +if [ -f "/etc/init.d/podkop" ]; then + path_podkop_config="/etc/config/podkop" + path_podkop_config_backup="/root/podkop" + URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" + printf "Podkop installed. Reconfigured on AWG WARP? (y/n): \n" + read is_reconfig_podkop + if [ "$is_reconfig_podkop" = "y" ] || [ "$is_reconfig_podkop" = "Y" ]; then + cp -f "$path_podkop_config" "$path_podkop_config_backup" + wget -O "$path_podkop_config" "$URL/podkop" + echo "Backup of your config in path '$path_podkop_config_backup'" + echo "Podkop reconfigured..." + echo "Service Podkop restart..." + service podkop restart + fi +else + printf "\033[32;1mInstall and configure PODKOP (a tool for point routing of traffic)?? (y/n): \033[0m\n" + read is_install_podkop -printf "\033[32;1mInstall and configure PODKOP (a tool for point routing of traffic)?? (y/n): \033[0m\n" -read is_install_podkop + if [ "$is_install_podkop" = "y" ] || [ "$is_install_podkop" = "Y" ]; then + DOWNLOAD_DIR="/tmp/podkop" + mkdir -p "$DOWNLOAD_DIR" + REPO="https://api.github.com/repos/itdoginfo/podkop/releases/tags/v0.2.5" + wget -qO- "$REPO" | grep -o 'https://[^"]*\.ipk' | while read -r url; do + filename=$(basename "$url") + echo "Download $filename..." + wget -q -O "$DOWNLOAD_DIR/$filename" "$url" + done + opkg install $DOWNLOAD_DIR/podkop*.ipk + opkg install $DOWNLOAD_DIR/luci-app-podkop*.ipk + opkg install $DOWNLOAD_DIR/luci-i18n-podkop-ru*.ipk + rm -f $DOWNLOAD_DIR/podkop*.ipk $DOWNLOAD_DIR/luci-app-podkop*.ipk $DOWNLOAD_DIR/luci-i18n-podkop-ru*.ipk -if [ "$is_install_podkop" = "y" ] || [ "$is_install_podkop" = "Y" ]; then - DOWNLOAD_DIR="/tmp/podkop" - mkdir -p "$DOWNLOAD_DIR" - REPO="https://api.github.com/repos/itdoginfo/podkop/releases/tags/v0.2.5" - wget -qO- "$REPO" | grep -o 'https://[^"]*\.ipk' | while read -r url; do - filename=$(basename "$url") - echo "Download $filename..." - wget -q -O "$DOWNLOAD_DIR/$filename" "$url" - done - opkg install $DOWNLOAD_DIR/podkop*.ipk - opkg install $DOWNLOAD_DIR/luci-app-podkop*.ipk - opkg install $DOWNLOAD_DIR/luci-i18n-podkop-ru*.ipk - rm -f $DOWNLOAD_DIR/podkop*.ipk $DOWNLOAD_DIR/luci-app-podkop*.ipk $DOWNLOAD_DIR/luci-i18n-podkop-ru*.ipk - - uci set podkop.main.mode='vpn' - uci set podkop.main.interface="$INTERFACE_NAME" - uci set podkop.main.domain_list_enabled='1' - uci set podkop.main.domain_list='ru_inside' - uci set podkop.main.delist_domains_enabled='0' - uci add_list podkop.main.subnets='meta' - uci add_list podkop.main.subnets='twitter' - uci add_list podkop.main.subnets='discord' - uci commit podkop + uci set podkop.main.mode='vpn' + uci set podkop.main.interface="$INTERFACE_NAME" + uci set podkop.main.domain_list_enabled='1' + uci set podkop.main.domain_list='ru_inside' + uci set podkop.main.delist_domains_enabled='0' + uci add_list podkop.main.subnets='meta' + uci add_list podkop.main.subnets='twitter' + uci add_list podkop.main.subnets='discord' + uci commit podkop + echo "Service Podkop restart..." + service podkop restart + fi fi - -printf "\033[32;1mStop and disabled service 'youtubeUnblock'...\033[0m\n" +printf "\033[32;1mStop and disabled service 'youtubeUnblock'...\033[0m" service youtubeUnblock stop service youtubeUnblock disable From e8fa81656f38efdf4a242a5592556701513dbf3f Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Tue, 25 Feb 2025 13:52:47 +0500 Subject: [PATCH 26/83] Fix replace config after repeat run script --- configure_zaprets.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index d03d908..cac934d 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -35,18 +35,18 @@ then do cp -f "$DIR/$file" "$DIR_BACKUP/$file" done + + echo "Replace configs..." + + for file in $config_files + do + if [ "$file" != "dhcp" ] + then + wget -O "$DIR/$file" "$URL/$file" + fi + done fi -echo "Replace configs..." - -for file in $config_files -do - if [ "$file" != "dhcp" ] - then - wget -O "$DIR/$file" "$URL/$file" - fi -done - echo "Configure dhcp..." uci set dhcp.cfg01411c.strictorder='1' From 69cd22b996a0fe83c88f72bfe0592f584609002d Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Tue, 25 Feb 2025 14:01:08 +0500 Subject: [PATCH 27/83] Update awg_config.sh --- awg_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awg_config.sh b/awg_config.sh index 5a75383..50cab3e 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -241,7 +241,7 @@ fi if [ -f "/etc/init.d/podkop" ]; then path_podkop_config="/etc/config/podkop" path_podkop_config_backup="/root/podkop" - URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" + URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main" printf "Podkop installed. Reconfigured on AWG WARP? (y/n): \n" read is_reconfig_podkop if [ "$is_reconfig_podkop" = "y" ] || [ "$is_reconfig_podkop" = "Y" ]; then From 087d77c07b7c8fe671d6d18890266a7a91483660 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Tue, 25 Feb 2025 14:06:51 +0500 Subject: [PATCH 28/83] Fix url repo From 9d1c1af6f2c27724dbd7d2116e454d71a85f28f3 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Tue, 25 Feb 2025 22:33:00 +0500 Subject: [PATCH 29/83] Fix bug input confirm install podkop --- awg_config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/awg_config.sh b/awg_config.sh index 5a75383..d85a58b 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -255,6 +255,7 @@ if [ -f "/etc/init.d/podkop" ]; then else printf "\033[32;1mInstall and configure PODKOP (a tool for point routing of traffic)?? (y/n): \033[0m\n" read is_install_podkop + read is_install_podkop if [ "$is_install_podkop" = "y" ] || [ "$is_install_podkop" = "Y" ]; then DOWNLOAD_DIR="/tmp/podkop" From a60d35cbd271041efb1f5b17a311a5f6972580da Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Tue, 25 Feb 2025 22:42:37 +0500 Subject: [PATCH 30/83] Fix bug input confirm install podkop --- awg_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awg_config.sh b/awg_config.sh index d85a58b..29234c0 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -254,7 +254,7 @@ if [ -f "/etc/init.d/podkop" ]; then fi else printf "\033[32;1mInstall and configure PODKOP (a tool for point routing of traffic)?? (y/n): \033[0m\n" - read is_install_podkop + read -r -t 1 read is_install_podkop if [ "$is_install_podkop" = "y" ] || [ "$is_install_podkop" = "Y" ]; then From 6b46020866ae06b518840fd3239a9bfe1a398364 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Tue, 25 Feb 2025 22:46:03 +0500 Subject: [PATCH 31/83] Fix bug input confirm install podkop --- awg_config.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index 29234c0..bac7911 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -239,10 +239,11 @@ if ! uci show firewall | grep -q "@forwarding.*name='${ZONE_NAME}'"; then fi if [ -f "/etc/init.d/podkop" ]; then - path_podkop_config="/etc/config/podkop" + path_podkop_config="/etc/config/podkop" path_podkop_config_backup="/root/podkop" URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" printf "Podkop installed. Reconfigured on AWG WARP? (y/n): \n" + is_reconfig_podkop="y" read is_reconfig_podkop if [ "$is_reconfig_podkop" = "y" ] || [ "$is_reconfig_podkop" = "Y" ]; then cp -f "$path_podkop_config" "$path_podkop_config_backup" @@ -254,7 +255,7 @@ if [ -f "/etc/init.d/podkop" ]; then fi else printf "\033[32;1mInstall and configure PODKOP (a tool for point routing of traffic)?? (y/n): \033[0m\n" - read -r -t 1 + is_install_podkop="y" read is_install_podkop if [ "$is_install_podkop" = "y" ] || [ "$is_install_podkop" = "Y" ]; then From dab5e0bbefaa2a1abcc18123f50bde5f58679663 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Tue, 25 Feb 2025 22:50:42 +0500 Subject: [PATCH 32/83] test disable input --- awg_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index bac7911..679edbb 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -244,7 +244,7 @@ if [ -f "/etc/init.d/podkop" ]; then URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" printf "Podkop installed. Reconfigured on AWG WARP? (y/n): \n" is_reconfig_podkop="y" - read is_reconfig_podkop + #read is_reconfig_podkop if [ "$is_reconfig_podkop" = "y" ] || [ "$is_reconfig_podkop" = "Y" ]; then cp -f "$path_podkop_config" "$path_podkop_config_backup" wget -O "$path_podkop_config" "$URL/podkop" @@ -256,7 +256,7 @@ if [ -f "/etc/init.d/podkop" ]; then else printf "\033[32;1mInstall and configure PODKOP (a tool for point routing of traffic)?? (y/n): \033[0m\n" is_install_podkop="y" - read is_install_podkop + #read is_install_podkop if [ "$is_install_podkop" = "y" ] || [ "$is_install_podkop" = "Y" ]; then DOWNLOAD_DIR="/tmp/podkop" From 762aaa9b99b12e73a7c4b23ac39dd462a4058111 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Tue, 25 Feb 2025 22:55:52 +0500 Subject: [PATCH 33/83] Fix bug input confirm install podkop --- awg_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index 679edbb..bac7911 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -244,7 +244,7 @@ if [ -f "/etc/init.d/podkop" ]; then URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" printf "Podkop installed. Reconfigured on AWG WARP? (y/n): \n" is_reconfig_podkop="y" - #read is_reconfig_podkop + read is_reconfig_podkop if [ "$is_reconfig_podkop" = "y" ] || [ "$is_reconfig_podkop" = "Y" ]; then cp -f "$path_podkop_config" "$path_podkop_config_backup" wget -O "$path_podkop_config" "$URL/podkop" @@ -256,7 +256,7 @@ if [ -f "/etc/init.d/podkop" ]; then else printf "\033[32;1mInstall and configure PODKOP (a tool for point routing of traffic)?? (y/n): \033[0m\n" is_install_podkop="y" - #read is_install_podkop + read is_install_podkop if [ "$is_install_podkop" = "y" ] || [ "$is_install_podkop" = "Y" ]; then DOWNLOAD_DIR="/tmp/podkop" From db9c90ca9753fc76494756e6d4662aa88aa7aa37 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Wed, 26 Feb 2025 11:25:50 +0500 Subject: [PATCH 34/83] Refactoring and fix add interfaces AmneziaWG --- awg_config.sh | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index bac7911..bdd2b40 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -184,9 +184,12 @@ ZONE_NAME="awg" uci set network.${INTERFACE_NAME}=interface uci set network.${INTERFACE_NAME}.proto=$PROTO +if ! uci show network | grep -q ${CONFIG_NAME}; then + uci add network ${CONFIG_NAME} +fi uci set network.${INTERFACE_NAME}.private_key=$PrivateKey -uci set network.${INTERFACE_NAME}.listen_port='51821' -uci set network.${INTERFACE_NAME}.addresses=$Address +uci add_list network.${INTERFACE_NAME}.addresses=$Address +uci set network.${INTERFACE_NAME}.mtu=$MTU uci set network.${INTERFACE_NAME}.awg_jc=$Jc uci set network.${INTERFACE_NAME}.awg_jmin=$Jmin uci set network.${INTERFACE_NAME}.awg_jmax=$Jmax @@ -196,21 +199,13 @@ uci set network.${INTERFACE_NAME}.awg_h1=$H1 uci set network.${INTERFACE_NAME}.awg_h2=$H2 uci set network.${INTERFACE_NAME}.awg_h3=$H3 uci set network.${INTERFACE_NAME}.awg_h4=$H4 -uci set network.${INTERFACE_NAME}.mtu=$MTU - -if ! uci show network | grep -q ${CONFIG_NAME}; then - uci add network ${CONFIG_NAME} - echo "add $INTERFACE_NAME" -fi - -uci set network.@${CONFIG_NAME}[0]=$CONFIG_NAME -uci set network.@${CONFIG_NAME}[0].name="${INTERFACE_NAME}_client" -uci set network.@${CONFIG_NAME}[0].public_key=$PublicKey -uci set network.@${CONFIG_NAME}[0].route_allowed_ips='0' -uci set network.@${CONFIG_NAME}[0].persistent_keepalive='25' -uci set network.@${CONFIG_NAME}[0].endpoint_host=$EndpointIP -uci set network.@${CONFIG_NAME}[0].allowed_ips='0.0.0.0/0' -uci set network.@${CONFIG_NAME}[0].endpoint_port=$EndpointPort +uci set network.@${CONFIG_NAME}[-1].description="${INTERFACE_NAME}_peer" +uci set network.@${CONFIG_NAME}[-1].public_key=$PublicKey +uci set network.@${CONFIG_NAME}[-1].endpoint_host=$EndpointIP +uci set network.@${CONFIG_NAME}[-1].endpoint_port=$EndpointPort +uci set network.@${CONFIG_NAME}[-1].persistent_keepalive='25' +uci set network.@${CONFIG_NAME}[-1].allowed_ips='0.0.0.0/0' +uci set network.@${CONFIG_NAME}[-1].route_allowed_ips='0' uci commit network if ! uci show firewall | grep -q "@zone.*name='${ZONE_NAME}'"; then @@ -231,7 +226,7 @@ if ! uci show firewall | grep -q "@forwarding.*name='${ZONE_NAME}'"; then printf "\033[32;1mConfigured forwarding\033[0m\n" uci add firewall forwarding uci set firewall.@forwarding[-1]=forwarding - uci set firewall.@forwarding[-1].name="${ZONE_NAME}-lan" + uci set firewall.@forwarding[-1].name="${ZONE_NAME}" uci set firewall.@forwarding[-1].dest=${ZONE_NAME} uci set firewall.@forwarding[-1].src='lan' uci set firewall.@forwarding[-1].family='ipv4' From 7d528f94565a39b16a22f42bf8cd37e77ffaa21b Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Wed, 26 Feb 2025 14:03:19 +0500 Subject: [PATCH 35/83] Change interface name AWG --- awg_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index bdd2b40..11f6625 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -177,8 +177,8 @@ EndpointPort=$(echo "$Endpoint" | cut -d':' -f2) echo "Create and configure tunnel AmneziaWG WARP..." #задаём имя интерфейса -INTERFACE_NAME="awg_route0" -CONFIG_NAME="amnezia_route0" +INTERFACE_NAME="awg_route10" +CONFIG_NAME="amnezia_route10" PROTO="amneziawg" ZONE_NAME="awg" From 0525f17c6bed336c859c5b60e23e66d7bfbc1140 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Wed, 26 Feb 2025 15:59:08 +0500 Subject: [PATCH 36/83] Fix bug delete interface AWG and not add zone AWG --- awg_config.sh | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/awg_config.sh b/awg_config.sh index 11f6625..a06c7dd 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -174,7 +174,7 @@ AllowedIPs=$(echo "$AllowedIPs" | cut -d',' -f1) EndpointIP=$(echo "$Endpoint" | cut -d':' -f1) EndpointPort=$(echo "$Endpoint" | cut -d':' -f2) -echo "Create and configure tunnel AmneziaWG WARP..." +printf "\033[32;1mCreate and configure tunnel AmneziaWG WARP...\033[0m\n" #задаём имя интерфейса INTERFACE_NAME="awg_route10" @@ -233,6 +233,26 @@ if ! uci show firewall | grep -q "@forwarding.*name='${ZONE_NAME}'"; then uci commit firewall fi +# Получаем список всех зон +ZONES=$(uci show firewall | grep "zone$" | cut -d'=' -f1) +#echo $ZONES +# Циклически проходим по всем зонам +for zone in $ZONES; do + # Получаем имя зоны + CURR_ZONE_NAME=$(uci get $zone.name) + #echo $CURR_ZONE_NAME + # Проверяем, является ли это зона с именем "$ZONE_NAME" + if [ "$CURR_ZONE_NAME" = "$ZONE_NAME" ]; then + # Проверяем, существует ли интерфейс в зоне + if ! uci get $zone.network | grep -q "$INTERFACE_NAME"; then + # Добавляем интерфейс в зону + uci add_list $zone.network="$INTERFACE_NAME" + uci commit firewall + #echo "Интерфейс '$INTERFACE_NAME' добавлен в зону '$ZONE_NAME'" + fi + fi +done + if [ -f "/etc/init.d/podkop" ]; then path_podkop_config="/etc/config/podkop" path_podkop_config_backup="/root/podkop" From acb44b653591ef8fb80616c8859023c19e7ba78f Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Wed, 26 Feb 2025 22:03:28 +0500 Subject: [PATCH 37/83] Update awg_config.sh --- awg_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awg_config.sh b/awg_config.sh index a06c7dd..6c56a31 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -92,7 +92,7 @@ echo "opkg update" opkg update #проверка и установка пакетов AmneziaWG -install_awg_packages +#install_awg_packages #проверяем установлени ли библиотека jq if opkg list-installed | grep -q jq; then From f77ddd22467f70f8748b18ccbf1f310e31eee3cd Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Wed, 26 Feb 2025 23:22:51 +0500 Subject: [PATCH 38/83] Fix create AmneziaWG tunnel --- awg_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index 6c56a31..f35dc69 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -177,8 +177,8 @@ EndpointPort=$(echo "$Endpoint" | cut -d':' -f2) printf "\033[32;1mCreate and configure tunnel AmneziaWG WARP...\033[0m\n" #задаём имя интерфейса -INTERFACE_NAME="awg_route10" -CONFIG_NAME="amnezia_route10" +INTERFACE_NAME="awg10" +CONFIG_NAME="amneziawg_awg10" PROTO="amneziawg" ZONE_NAME="awg" From 619e1aac26fad55bfdf80c39b7c7fed4d43a7ad6 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Wed, 26 Feb 2025 23:47:31 +0500 Subject: [PATCH 39/83] Check AmneziaWG packets --- awg_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awg_config.sh b/awg_config.sh index f35dc69..976a417 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -92,7 +92,7 @@ echo "opkg update" opkg update #проверка и установка пакетов AmneziaWG -#install_awg_packages +install_awg_packages #проверяем установлени ли библиотека jq if opkg list-installed | grep -q jq; then From 17b6610fc77df81890e703ffe626477b589b3077 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Wed, 26 Feb 2025 23:52:07 +0500 Subject: [PATCH 40/83] Change awg tunnel for config --- podkop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podkop b/podkop index 1baa571..846327a 100644 --- a/podkop +++ b/podkop @@ -12,7 +12,7 @@ config main 'main' option exclude_ntp '1' option update_interval '0 4 * * *' option custom_local_domains_list_enabled '0' - option interface 'awg_route0' + option interface 'awg_route10' option domain_list 'ru_inside' option delist_domains_enabled '0' list subnets 'meta' From 9c95f2f916affa0205668890fc2c7c8d4183d263 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Wed, 26 Feb 2025 23:52:59 +0500 Subject: [PATCH 41/83] Change awg tunnel for config --- podkop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podkop b/podkop index 846327a..8f086fb 100644 --- a/podkop +++ b/podkop @@ -12,7 +12,7 @@ config main 'main' option exclude_ntp '1' option update_interval '0 4 * * *' option custom_local_domains_list_enabled '0' - option interface 'awg_route10' + option interface 'awg10' option domain_list 'ru_inside' option delist_domains_enabled '0' list subnets 'meta' From 1f61888680b13035a2f064c817bfa955459062f2 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 00:23:33 +0500 Subject: [PATCH 42/83] Fix install Podkop --- awg_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awg_config.sh b/awg_config.sh index 976a417..f2ba7b0 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -291,7 +291,7 @@ else uci set podkop.main.interface="$INTERFACE_NAME" uci set podkop.main.domain_list_enabled='1' uci set podkop.main.domain_list='ru_inside' - uci set podkop.main.delist_domains_enabled='0' + uci set podkop.main.subnets_list_enabled='1' uci add_list podkop.main.subnets='meta' uci add_list podkop.main.subnets='twitter' uci add_list podkop.main.subnets='discord' From c52bb98b5e31970d09777b3265425302fefb55d7 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 00:34:39 +0500 Subject: [PATCH 43/83] Fix install Podkop --- awg_config.sh | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index f2ba7b0..602067c 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -253,9 +253,10 @@ for zone in $ZONES; do fi done +path_podkop_config="/etc/config/podkop" +path_podkop_config_backup="/root/podkop" + if [ -f "/etc/init.d/podkop" ]; then - path_podkop_config="/etc/config/podkop" - path_podkop_config_backup="/root/podkop" URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" printf "Podkop installed. Reconfigured on AWG WARP? (y/n): \n" is_reconfig_podkop="y" @@ -265,8 +266,6 @@ if [ -f "/etc/init.d/podkop" ]; then wget -O "$path_podkop_config" "$URL/podkop" echo "Backup of your config in path '$path_podkop_config_backup'" echo "Podkop reconfigured..." - echo "Service Podkop restart..." - service podkop restart fi else printf "\033[32;1mInstall and configure PODKOP (a tool for point routing of traffic)?? (y/n): \033[0m\n" @@ -286,18 +285,8 @@ else opkg install $DOWNLOAD_DIR/luci-app-podkop*.ipk opkg install $DOWNLOAD_DIR/luci-i18n-podkop-ru*.ipk rm -f $DOWNLOAD_DIR/podkop*.ipk $DOWNLOAD_DIR/luci-app-podkop*.ipk $DOWNLOAD_DIR/luci-i18n-podkop-ru*.ipk - - uci set podkop.main.mode='vpn' - uci set podkop.main.interface="$INTERFACE_NAME" - uci set podkop.main.domain_list_enabled='1' - uci set podkop.main.domain_list='ru_inside' - uci set podkop.main.subnets_list_enabled='1' - uci add_list podkop.main.subnets='meta' - uci add_list podkop.main.subnets='twitter' - uci add_list podkop.main.subnets='discord' - uci commit podkop - echo "Service Podkop restart..." - service podkop restart + wget -O "$path_podkop_config" "$URL/podkop" + echo "Podkop installed.." fi fi @@ -308,3 +297,6 @@ service youtubeUnblock disable printf "Configured completed...\n\033[32;1mRestart network...\033[0m\n" service firewall restart service network restart + +echo "Service Podkop restart..." +service podkop restart From f0f03fcf5b25f228617d8b08601ed16967606e48 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 00:38:58 +0500 Subject: [PATCH 44/83] Change hints --- awg_config.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index 602067c..97a6c56 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -290,13 +290,15 @@ else fi fi -printf "\033[32;1mStop and disabled service 'youtubeUnblock'...\033[0m" +printf "\033[32;1mStop and disabled service 'youtubeUnblock'...\033[0m\n" service youtubeUnblock stop service youtubeUnblock disable -printf "Configured completed...\n\033[32;1mRestart network...\033[0m\n" +printf "\033[32;1mRestart firewall and network...\033[0m\n" service firewall restart service network restart -echo "Service Podkop restart..." +echo "Service Podkop restart...\n" service podkop restart + +printf "\033[32;1mConfigured completed...\033[0m" From 3dba5243ee4c3ed72b22e083beadc735f8941d1a Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 00:40:17 +0500 Subject: [PATCH 45/83] Change hints --- awg_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awg_config.sh b/awg_config.sh index 97a6c56..2f9337a 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -298,7 +298,7 @@ printf "\033[32;1mRestart firewall and network...\033[0m\n" service firewall restart service network restart -echo "Service Podkop restart...\n" +printf "\033[32;1mService Podkop restart...\033[0m\n" service podkop restart printf "\033[32;1mConfigured completed...\033[0m" From 5cba67b04ef3e6ec1668fe8994c363961e2e3345 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 00:51:41 +0500 Subject: [PATCH 46/83] Fix install Podkop --- awg_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awg_config.sh b/awg_config.sh index 2f9337a..b1be5fb 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -255,9 +255,9 @@ done path_podkop_config="/etc/config/podkop" path_podkop_config_backup="/root/podkop" +URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" if [ -f "/etc/init.d/podkop" ]; then - URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" printf "Podkop installed. Reconfigured on AWG WARP? (y/n): \n" is_reconfig_podkop="y" read is_reconfig_podkop From 931f369882bdc2b6bc4ec75b9712a4a4d806e4eb Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 01:05:52 +0500 Subject: [PATCH 47/83] Add sleep before reboot Podkop --- awg_config.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/awg_config.sh b/awg_config.sh index b1be5fb..5912460 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -298,6 +298,9 @@ printf "\033[32;1mRestart firewall and network...\033[0m\n" service firewall restart service network restart +second=15 +echo "Please wait $second seconds for reboot network..." +sleep $second printf "\033[32;1mService Podkop restart...\033[0m\n" service podkop restart From b60f440bacc4ba91dcfe325c5b8aca7398fadf4d Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 01:13:23 +0500 Subject: [PATCH 48/83] Add custom domain 2ip.ru --- podkop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/podkop b/podkop index 8f086fb..a8e224b 100644 --- a/podkop +++ b/podkop @@ -3,7 +3,7 @@ config main 'main' option mode 'vpn' option domain_list_enabled '1' option subnets_list_enabled '1' - option custom_domains_list_enabled 'disabled' + option custom_domains_list_enabled 'dynamic' option custom_subnets_list_enabled 'disabled' option all_traffic_from_ip_enabled '0' option custom_download_domains_list_enabled '0' @@ -18,7 +18,7 @@ config main 'main' list subnets 'meta' list subnets 'twitter' list subnets 'discord' - + list custom_domains '2ip.ru' config second 'second' option second_enable '0' option domain_list_enabled '0' From 45f515572e1ba536325c89c323061405e393367b Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 01:15:21 +0500 Subject: [PATCH 49/83] Add custom domain 2ip.ru --- podkop | 1 + 1 file changed, 1 insertion(+) diff --git a/podkop b/podkop index a8e224b..4860422 100644 --- a/podkop +++ b/podkop @@ -19,6 +19,7 @@ config main 'main' list subnets 'twitter' list subnets 'discord' list custom_domains '2ip.ru' + config second 'second' option second_enable '0' option domain_list_enabled '0' From 73d3627da7577c6e59903dea6a3f4481baeabc63 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 03:11:36 +0500 Subject: [PATCH 50/83] Podkop packets --- luci-app-podkop_0.2.5_all.ipk | Bin 0 -> 5971 bytes luci-i18n-podkop-ru_0.2.5.ipk | Bin 0 -> 4120 bytes podkop_0.2.5-1_all.ipk | Bin 0 -> 10303 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 luci-app-podkop_0.2.5_all.ipk create mode 100644 luci-i18n-podkop-ru_0.2.5.ipk create mode 100644 podkop_0.2.5-1_all.ipk diff --git a/luci-app-podkop_0.2.5_all.ipk b/luci-app-podkop_0.2.5_all.ipk new file mode 100644 index 0000000000000000000000000000000000000000..499ad73b58763b0e998188b6fbea9245ae6ed5e8 GIT binary patch literal 5971 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 R+qeH${5OZ1w21&v003EjOyU3l literal 0 HcmV?d00001 From 442b846628c21fb1daba32ab35fb4258a464c3f1 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 03:31:22 +0500 Subject: [PATCH 51/83] Change source url Podkop --- awg_config.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index 5912460..95ac831 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -275,11 +275,13 @@ else if [ "$is_install_podkop" = "y" ] || [ "$is_install_podkop" = "Y" ]; then DOWNLOAD_DIR="/tmp/podkop" mkdir -p "$DOWNLOAD_DIR" - REPO="https://api.github.com/repos/itdoginfo/podkop/releases/tags/v0.2.5" - wget -qO- "$REPO" | grep -o 'https://[^"]*\.ipk' | while read -r url; do - filename=$(basename "$url") - echo "Download $filename..." - wget -q -O "$DOWNLOAD_DIR/$filename" "$url" + podkop_files="podkop_0.2.5-1_all.ipk + luci-app-podkop_0.2.5_all.ipk + luci-i18n-podkop-ru_0.2.5.ipk" + for file in $podkop_files + do + echo "Download $file..." + wget -q -O "$DOWNLOAD_DIR/$file" "$URL/$file" done opkg install $DOWNLOAD_DIR/podkop*.ipk opkg install $DOWNLOAD_DIR/luci-app-podkop*.ipk From 7e9285c58d4964ccefca7b6da094656416f19da0 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 04:21:33 +0000 Subject: [PATCH 52/83] Changes in repo --- awg_config.sh | 6 +++--- dhcp => config_files/dhcp | 0 https-dns-proxy => config_files/https-dns-proxy | 0 podkop => config_files/podkop | 0 youtubeUnblock => config_files/youtubeUnblock | 0 configure_zaprets.sh | 2 +- .../luci-app-podkop_0.2.5_all.ipk | Bin .../luci-i18n-podkop-ru_0.2.5.ipk | Bin .../podkop_0.2.5-1_all.ipk | Bin 9 files changed, 4 insertions(+), 4 deletions(-) rename dhcp => config_files/dhcp (100%) rename https-dns-proxy => config_files/https-dns-proxy (100%) rename podkop => config_files/podkop (100%) rename youtubeUnblock => config_files/youtubeUnblock (100%) rename luci-app-podkop_0.2.5_all.ipk => podkop_packets/luci-app-podkop_0.2.5_all.ipk (100%) rename luci-i18n-podkop-ru_0.2.5.ipk => podkop_packets/luci-i18n-podkop-ru_0.2.5.ipk (100%) rename podkop_0.2.5-1_all.ipk => podkop_packets/podkop_0.2.5-1_all.ipk (100%) diff --git a/awg_config.sh b/awg_config.sh index 95ac831..bf1abb2 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -263,7 +263,7 @@ if [ -f "/etc/init.d/podkop" ]; then read is_reconfig_podkop if [ "$is_reconfig_podkop" = "y" ] || [ "$is_reconfig_podkop" = "Y" ]; then cp -f "$path_podkop_config" "$path_podkop_config_backup" - wget -O "$path_podkop_config" "$URL/podkop" + wget -O "$path_podkop_config" "$URL/config_files/podkop" echo "Backup of your config in path '$path_podkop_config_backup'" echo "Podkop reconfigured..." fi @@ -281,13 +281,13 @@ else for file in $podkop_files do echo "Download $file..." - wget -q -O "$DOWNLOAD_DIR/$file" "$URL/$file" + wget -q -O "$DOWNLOAD_DIR/$file" "$URL/podkop_packets/$file" done opkg install $DOWNLOAD_DIR/podkop*.ipk opkg install $DOWNLOAD_DIR/luci-app-podkop*.ipk opkg install $DOWNLOAD_DIR/luci-i18n-podkop-ru*.ipk rm -f $DOWNLOAD_DIR/podkop*.ipk $DOWNLOAD_DIR/luci-app-podkop*.ipk $DOWNLOAD_DIR/luci-i18n-podkop-ru*.ipk - wget -O "$path_podkop_config" "$URL/podkop" + wget -O "$path_podkop_config" "$URL/config_files/podkop" echo "Podkop installed.." fi fi diff --git a/dhcp b/config_files/dhcp similarity index 100% rename from dhcp rename to config_files/dhcp diff --git a/https-dns-proxy b/config_files/https-dns-proxy similarity index 100% rename from https-dns-proxy rename to config_files/https-dns-proxy diff --git a/podkop b/config_files/podkop similarity index 100% rename from podkop rename to config_files/podkop diff --git a/youtubeUnblock b/config_files/youtubeUnblock similarity index 100% rename from youtubeUnblock rename to config_files/youtubeUnblock diff --git a/configure_zaprets.sh b/configure_zaprets.sh index cac934d..81832ac 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -42,7 +42,7 @@ then do if [ "$file" != "dhcp" ] then - wget -O "$DIR/$file" "$URL/$file" + wget -O "$DIR/$file" "$URL/config_files/$file" fi done fi diff --git a/luci-app-podkop_0.2.5_all.ipk b/podkop_packets/luci-app-podkop_0.2.5_all.ipk similarity index 100% rename from luci-app-podkop_0.2.5_all.ipk rename to podkop_packets/luci-app-podkop_0.2.5_all.ipk diff --git a/luci-i18n-podkop-ru_0.2.5.ipk b/podkop_packets/luci-i18n-podkop-ru_0.2.5.ipk similarity index 100% rename from luci-i18n-podkop-ru_0.2.5.ipk rename to podkop_packets/luci-i18n-podkop-ru_0.2.5.ipk diff --git a/podkop_0.2.5-1_all.ipk b/podkop_packets/podkop_0.2.5-1_all.ipk similarity index 100% rename from podkop_0.2.5-1_all.ipk rename to podkop_packets/podkop_0.2.5-1_all.ipk From afc6b263e09472c1500dd34597ab1e0990ee69d0 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 10:47:23 +0500 Subject: [PATCH 53/83] Create README.md --- README.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..f1943f8 --- /dev/null +++ b/README.md @@ -0,0 +1,28 @@ +# RouterichAX3000_configs + +Протестировано на роутере Routerich AX 3000 прошивка OpenWrt 23.05.5 r24106-10cc5fcd00 + +### Разблокировка сайтов с помощью youtubeunblock + https-dns-proxy +Разблокировка сайтов с помощью подмены **Hello пакетов DPI** (приложение **youtubeUnblock**) + точечное перенаправление доменов, которые находятся в **геоблоке на ComssDNS** (через перенаправление dnsmasq и пакет **https-dns-proxy**) + добавление правил для **блокировки протокола QUIC** на уровне роутера + +Для корректной работы скрипта нужны установленные пакеты **youtubeUnblock** и **https-dns-proxy** + +**Установка** +```sh +wget -O - https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main/configure_zaprets.sh | sh +``` +**Откат** +```sh +wget -O - https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main/off_configure_zaprets.sh | sh +``` + +### Разблокировка сайтов с помощью WARP от CloudFlare + +**Установка** +```sh +wget --no-check-certificate -O /tmp/awg_config.sh https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main/awg_config.sh && chmod +x /tmp/awg_config.sh && /tmp/awg_config.sh +``` +**Откат** +```sh +wget -O - https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main/off_awg_config.sh | sh +``` From 1de249731ef070f95b2bd3059cb73ba9419fbc96 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 11:36:59 +0500 Subject: [PATCH 54/83] Add parametr -p for mkdir --- configure_zaprets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index 81832ac..aefca84 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -30,7 +30,7 @@ opkg upgrade luci-app-youtubeUnblock if [ ! -d "$DIR_BACKUP" ] then echo "Backup files..." - mkdir $DIR_BACKUP + mkdir -p $DIR_BACKUP for file in $config_files do cp -f "$DIR/$file" "$DIR_BACKUP/$file" From 05a8b54f67b03681fc604f49e62dbe104be3a4cf Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 13:42:08 +0500 Subject: [PATCH 55/83] Add backup files --- awg_config.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/awg_config.sh b/awg_config.sh index bf1abb2..6f02f7e 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -133,6 +133,20 @@ else fi fi +DIR="/etc/config" +DIR_BACKUP="/root/backup2" +config_files="network +firewall" + +if [ ! -d "$DIR_BACKUP" ] +then + echo "Backup files..." + mkdir -p $DIR_BACKUP + for file in $config_files + do + cp -f "$DIR/$file" "$DIR_BACKUP/$file" + done +fi #запрос конфигурации WARP result=$(curl 'https://warp.llimonix.pw/api/warp' \ From 7fe1c62549265697ac6d0d0ae29f59d4db73932e Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 13:44:04 +0500 Subject: [PATCH 56/83] Add if exists folder backup --- off_configure_zaprets.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/off_configure_zaprets.sh b/off_configure_zaprets.sh index a4f5953..baf7919 100644 --- a/off_configure_zaprets.sh +++ b/off_configure_zaprets.sh @@ -7,14 +7,16 @@ config_files="dhcp youtubeUnblock https-dns-proxy" -echo "Restore configs..." +if [ -d "$DIR_BACKUP" ] +then + echo "Restore configs..." + for file in $config_files + do + cp -f "$DIR_BACKUP/$file" "$DIR/$file" + done -for file in $config_files -do - cp -f "$DIR_BACKUP/$file" "$DIR/$file" -done - -rm -rf "$DIR_BACKUP" + rm -rf "$DIR_BACKUP" +fi echo "Restart service..." @@ -29,4 +31,4 @@ grep -v "0 4 \* \* \* wget -O - $URL/configure_zaprets.sh | sh" /etc/crontabs/ro cp -f "/etc/crontabs/temp" "/etc/crontabs/root" rm -f "/etc/crontabs/temp" -echo "Off configure complete..." +printf "\033[32;1mOff configured completed...\033[0m" From 7725a8381d34810dd6bb6873891beb83649a61d8 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 13:45:39 +0500 Subject: [PATCH 57/83] Update configure_zaprets.sh --- configure_zaprets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index aefca84..46454d0 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -154,4 +154,4 @@ service https-dns-proxy restart service dnsmasq restart service odhcpd restart -echo "Configure complete..." +printf "\033[32;1mConfigured completed...\033[0m" From 4daf49c8d2770a24cbbd935e6b81dc4b5160ad65 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 08:50:24 +0000 Subject: [PATCH 58/83] Add file off_awg_config.sh --- off_awg_config.sh | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 off_awg_config.sh diff --git a/off_awg_config.sh b/off_awg_config.sh new file mode 100644 index 0000000..95e5521 --- /dev/null +++ b/off_awg_config.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +DIR="/etc/config" +DIR_BACKUP="/root/backup2" +config_files="network +firewall" + + +if [ -d "$DIR_BACKUP" ] +then + echo "Restore configs..." + for file in $config_files + do + cp -f "$DIR_BACKUP/$file" "$DIR/$file" + done + + rm -rf "$DIR_BACKUP" +fi + +echo "Stop and disabled autostart Podkop..." +service podkop disable +service podkop stop + +echo "Run and enabled autostart youtubeUnblock..." +service youtubeUnblock enable +service youtubeUnblock start + +printf "\033[32;1mRestart firewall and network...\033[0m\n" +service firewall restart +service network restart + +printf "\033[32;1mOff configured completed...\033[0m" \ No newline at end of file From acdd3b9a2b6df954cb3f3afeb4a6725c6273b526 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 14:33:03 +0500 Subject: [PATCH 59/83] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f1943f8..70ba061 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Протестировано на роутере Routerich AX 3000 прошивка OpenWrt 23.05.5 r24106-10cc5fcd00 -### Разблокировка сайтов с помощью youtubeunblock + https-dns-proxy +### Разблокировка сайтов с помощью youtubeUnblock + https-dns-proxy Разблокировка сайтов с помощью подмены **Hello пакетов DPI** (приложение **youtubeUnblock**) + точечное перенаправление доменов, которые находятся в **геоблоке на ComssDNS** (через перенаправление dnsmasq и пакет **https-dns-proxy**) + добавление правил для **блокировки протокола QUIC** на уровне роутера Для корректной работы скрипта нужны установленные пакеты **youtubeUnblock** и **https-dns-proxy** From f3214f92ae157d2571403f3586c3a5ea260c5774 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 11:15:47 +0000 Subject: [PATCH 60/83] Add check packets install and stop/run and disable/enable --- awg_config.sh | 38 +++++++++++++++++++++++++++++++++++--- off_awg_config.sh | 40 +++++++++++++++++++++++++++++++++++----- 2 files changed, 70 insertions(+), 8 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index 6f02f7e..5900688 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -88,6 +88,38 @@ install_awg_packages() { rm -rf "$AWG_DIR" } +manage_package() { + local name="$1" + local autostart="$2" + local process="$3" + + # Проверка, установлен ли пакет + if opkg list-installed | grep -q "^$name"; then + + # Проверка, включен ли автозапуск + if /etc/init.d/$name enabled; then + if [ "$autostart" = "disable" ]; then + /etc/init.d/$name disable + fi + else + if [ "$autostart" = "enable" ]; then + /etc/init.d/$name enable + fi + fi + + # Проверка, запущен ли процесс + if pidof $name > /dev/null; then + if [ "$process" = "stop" ]; then + /etc/init.d/$name stop + fi + else + if [ "$process" = "start" ]; then + /etc/init.d/$name start + fi + fi + fi +} + echo "opkg update" opkg update @@ -306,9 +338,9 @@ else fi fi -printf "\033[32;1mStop and disabled service 'youtubeUnblock'...\033[0m\n" -service youtubeUnblock stop -service youtubeUnblock disable +printf "\033[32;1mStop and disabled service 'youtubeUnblock' and 'ruantiblock'...\033[0m\n" +manage_package "youtubeUnblock" "disable" "stop" +manage_package "ruantiblock" "disable" "stop" printf "\033[32;1mRestart firewall and network...\033[0m\n" service firewall restart diff --git a/off_awg_config.sh b/off_awg_config.sh index 95e5521..9ee07d5 100644 --- a/off_awg_config.sh +++ b/off_awg_config.sh @@ -5,6 +5,37 @@ DIR_BACKUP="/root/backup2" config_files="network firewall" +manage_package() { + local name="$1" + local autostart="$2" + local process="$3" + + # Проверка, установлен ли пакет + if opkg list-installed | grep -q "^$name"; then + + # Проверка, включен ли автозапуск + if /etc/init.d/$name enabled; then + if [ "$autostart" = "disable" ]; then + /etc/init.d/$name disable + fi + else + if [ "$autostart" = "enable" ]; then + /etc/init.d/$name enable + fi + fi + + # Проверка, запущен ли процесс + if pidof $name > /dev/null; then + if [ "$process" = "stop" ]; then + /etc/init.d/$name stop + fi + else + if [ "$process" = "start" ]; then + /etc/init.d/$name start + fi + fi + fi +} if [ -d "$DIR_BACKUP" ] then @@ -18,12 +49,11 @@ then fi echo "Stop and disabled autostart Podkop..." -service podkop disable -service podkop stop +manage_package "podkop" "disable" "stop" -echo "Run and enabled autostart youtubeUnblock..." -service youtubeUnblock enable -service youtubeUnblock start +echo "Run and enabled autostart youtubeUnblock and ruantiblock..." +manage_package "youtubeUnblock" "enable" "start" +manage_package "ruantiblock" "enable" "start" printf "\033[32;1mRestart firewall and network...\033[0m\n" service firewall restart From 79a214718ab2451e82479ed5ed47769f2f820367 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 21:12:31 +0500 Subject: [PATCH 61/83] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 70ba061..83eccf9 100644 --- a/README.md +++ b/README.md @@ -9,20 +9,20 @@ **Установка** ```sh -wget -O - https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main/configure_zaprets.sh | sh +wget -O - https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main/configure_zaprets.sh | sh ``` **Откат** ```sh -wget -O - https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main/off_configure_zaprets.sh | sh +wget -O - https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main/off_configure_zaprets.sh | sh ``` ### Разблокировка сайтов с помощью WARP от CloudFlare **Установка** ```sh -wget --no-check-certificate -O /tmp/awg_config.sh https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main/awg_config.sh && chmod +x /tmp/awg_config.sh && /tmp/awg_config.sh +wget --no-check-certificate -O /tmp/awg_config.sh https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main/awg_config.sh && chmod +x /tmp/awg_config.sh && /tmp/awg_config.sh ``` **Откат** ```sh -wget -O - https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main/off_awg_config.sh | sh +wget -O - https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main/off_awg_config.sh | sh ``` From 577df6b406755079f8eb5ec726b9664f86bcc213 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 16:25:02 +0000 Subject: [PATCH 62/83] Change repo --- awg_config.sh | 2 +- configure_zaprets.sh | 2 +- off_configure_zaprets.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index 5e73e37..5900688 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -301,7 +301,7 @@ done path_podkop_config="/etc/config/podkop" path_podkop_config_backup="/root/podkop" -URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main" +URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" if [ -f "/etc/init.d/podkop" ]; then printf "Podkop installed. Reconfigured on AWG WARP? (y/n): \n" diff --git a/configure_zaprets.sh b/configure_zaprets.sh index d382d7f..46454d0 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -1,6 +1,6 @@ #!/bin/sh -URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main" +URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" DIR="/etc/config" DIR_BACKUP="/root/backup" config_files="dhcp diff --git a/off_configure_zaprets.sh b/off_configure_zaprets.sh index a827626..baf7919 100644 --- a/off_configure_zaprets.sh +++ b/off_configure_zaprets.sh @@ -1,6 +1,6 @@ #!/bin/sh -URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main" +URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" DIR="/etc/config" DIR_BACKUP="/root/backup" config_files="dhcp From 668919c05d9defb677b04290344eeeb90fc11c8f Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 21:36:02 +0500 Subject: [PATCH 63/83] Delete cron task auto run script --- awg_config.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/awg_config.sh b/awg_config.sh index 5900688..79f6ccd 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -342,6 +342,10 @@ printf "\033[32;1mStop and disabled service 'youtubeUnblock' and 'ruantiblock'. manage_package "youtubeUnblock" "disable" "stop" manage_package "ruantiblock" "disable" "stop" +grep -v "0 4 \* \* \* wget -O - $URL/configure_zaprets.sh | sh" /etc/crontabs/root > /etc/crontabs/temp +cp -f "/etc/crontabs/temp" "/etc/crontabs/root" +rm -f "/etc/crontabs/temp" + printf "\033[32;1mRestart firewall and network...\033[0m\n" service firewall restart service network restart From 8184dc1d851029f8f419c259954a8ce616b4bcba Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 22:03:43 +0500 Subject: [PATCH 64/83] Check autorun script configure_zaprets.sh --- awg_config.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index 79f6ccd..d3c73d7 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -342,9 +342,13 @@ printf "\033[32;1mStop and disabled service 'youtubeUnblock' and 'ruantiblock'. manage_package "youtubeUnblock" "disable" "stop" manage_package "ruantiblock" "disable" "stop" -grep -v "0 4 \* \* \* wget -O - $URL/configure_zaprets.sh | sh" /etc/crontabs/root > /etc/crontabs/temp -cp -f "/etc/crontabs/temp" "/etc/crontabs/root" -rm -f "/etc/crontabs/temp" +str=$(grep -i "0 4 \* \* \* wget -O - $URL/configure_zaprets.sh | sh" /etc/crontabs/root) +if [ ! -z "$str" ] +then + grep -v "0 4 \* \* \* wget -O - $URL/configure_zaprets.sh | sh" /etc/crontabs/root > /etc/crontabs/temp + cp -f "/etc/crontabs/temp" "/etc/crontabs/root" + rm -f "/etc/crontabs/temp" +fi printf "\033[32;1mRestart firewall and network...\033[0m\n" service firewall restart From 380c8e44fe7f5a750b12fca22485157a5195cae3 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 22:05:03 +0500 Subject: [PATCH 65/83] Check autorun script configure_zaprets.sh --- off_configure_zaprets.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/off_configure_zaprets.sh b/off_configure_zaprets.sh index baf7919..db0bc44 100644 --- a/off_configure_zaprets.sh +++ b/off_configure_zaprets.sh @@ -27,8 +27,12 @@ service odhcpd restart echo "Remove cron task auto run script configure zaprets.." -grep -v "0 4 \* \* \* wget -O - $URL/configure_zaprets.sh | sh" /etc/crontabs/root > /etc/crontabs/temp -cp -f "/etc/crontabs/temp" "/etc/crontabs/root" -rm -f "/etc/crontabs/temp" +str=$(grep -i "0 4 \* \* \* wget -O - $URL/configure_zaprets.sh | sh" /etc/crontabs/root) +if [ ! -z "$str" ] +then + grep -v "0 4 \* \* \* wget -O - $URL/configure_zaprets.sh | sh" /etc/crontabs/root > /etc/crontabs/temp + cp -f "/etc/crontabs/temp" "/etc/crontabs/root" + rm -f "/etc/crontabs/temp" +fi printf "\033[32;1mOff configured completed...\033[0m" From a173eb4931732067628021f6306434a596b76401 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 22:09:16 +0500 Subject: [PATCH 66/83] Check and stop service Podkop --- configure_zaprets.sh | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index 46454d0..e3a33a2 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -21,6 +21,38 @@ checkAndAddDomainPermanentName() fi } +manage_package() { + local name="$1" + local autostart="$2" + local process="$3" + + # Проверка, установлен ли пакет + if opkg list-installed | grep -q "^$name"; then + + # Проверка, включен ли автозапуск + if /etc/init.d/$name enabled; then + if [ "$autostart" = "disable" ]; then + /etc/init.d/$name disable + fi + else + if [ "$autostart" = "enable" ]; then + /etc/init.d/$name enable + fi + fi + + # Проверка, запущен ли процесс + if pidof $name > /dev/null; then + if [ "$process" = "stop" ]; then + /etc/init.d/$name stop + fi + else + if [ "$process" = "start" ]; then + /etc/init.d/$name start + fi + fi + fi +} + echo "Upgrade packages..." opkg update @@ -147,6 +179,8 @@ then echo "$cronTask" >> /etc/crontabs/root fi +manage_package "podkop" "disable" "stop" + echo "Restart service..." service youtubeUnblock restart From 79a92e45827e69ba9444fa41f5726a3e0b92dc79 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 22:14:21 +0500 Subject: [PATCH 67/83] Change Repo URL --- awg_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awg_config.sh b/awg_config.sh index d3c73d7..2094195 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -301,7 +301,7 @@ done path_podkop_config="/etc/config/podkop" path_podkop_config_backup="/root/podkop" -URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" +URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main" if [ -f "/etc/init.d/podkop" ]; then printf "Podkop installed. Reconfigured on AWG WARP? (y/n): \n" From e67f420f49c3164838090d2d19f057a5fd9c6ca7 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 22:15:10 +0500 Subject: [PATCH 68/83] Change Repo URL --- configure_zaprets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index e3a33a2..669ba29 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -1,6 +1,6 @@ #!/bin/sh -URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" +URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main" DIR="/etc/config" DIR_BACKUP="/root/backup" config_files="dhcp From a1f99a94a0e6ddb29701d094820faad5d876a8fd Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 22:16:16 +0500 Subject: [PATCH 69/83] Change Repo URL --- off_configure_zaprets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/off_configure_zaprets.sh b/off_configure_zaprets.sh index db0bc44..ebbdcf1 100644 --- a/off_configure_zaprets.sh +++ b/off_configure_zaprets.sh @@ -1,6 +1,6 @@ #!/bin/sh -URL="https://raw.githubusercontent.com/CodeRoK7/RouterichAX3000_configs/refs/heads/main" +URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main" DIR="/etc/config" DIR_BACKUP="/root/backup" config_files="dhcp From afc73546b621fb1a38e5802117ba4f71de1fa060 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 23:53:32 +0500 Subject: [PATCH 70/83] Delete network restart --- off_awg_config.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/off_awg_config.sh b/off_awg_config.sh index 9ee07d5..86755ae 100644 --- a/off_awg_config.sh +++ b/off_awg_config.sh @@ -55,8 +55,8 @@ echo "Run and enabled autostart youtubeUnblock and ruantiblock..." manage_package "youtubeUnblock" "enable" "start" manage_package "ruantiblock" "enable" "start" -printf "\033[32;1mRestart firewall and network...\033[0m\n" +printf "\033[32;1mRestart firewall...\033[0m\n" service firewall restart -service network restart +#service network restart -printf "\033[32;1mOff configured completed...\033[0m" \ No newline at end of file +printf "\033[32;1mOff configured completed...\033[0m\n" From ddc9b39cbbd38a628261fdc7e744b69a154041de Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 23:54:27 +0500 Subject: [PATCH 71/83] Delete network restart --- awg_config.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index d3c73d7..3f9e07f 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -352,12 +352,16 @@ fi printf "\033[32;1mRestart firewall and network...\033[0m\n" service firewall restart -service network restart +#service network restart + +# Отключаем интерфейс +ifdown $INTERFACE_NAME +# Ждем несколько секунд (по желанию) +sleep 2 +# Включаем интерфейс +ifup $INTERFACE_NAME -second=15 -echo "Please wait $second seconds for reboot network..." -sleep $second printf "\033[32;1mService Podkop restart...\033[0m\n" service podkop restart -printf "\033[32;1mConfigured completed...\033[0m" +printf "\033[32;1mConfigured completed...\033[0m\n" From 147e931a64cfbf6e924c240cbc338445a81b34d7 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 23:54:54 +0500 Subject: [PATCH 72/83] Update configure_zaprets.sh --- configure_zaprets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index e3a33a2..f6769cf 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -188,4 +188,4 @@ service https-dns-proxy restart service dnsmasq restart service odhcpd restart -printf "\033[32;1mConfigured completed...\033[0m" +printf "\033[32;1mConfigured completed...\033[0m\n" From df37795bcb4b5cb9a3c28c560cbb361d5b2b0fc5 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 27 Feb 2025 23:55:55 +0500 Subject: [PATCH 73/83] Update off_configure_zaprets.sh --- off_configure_zaprets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/off_configure_zaprets.sh b/off_configure_zaprets.sh index db0bc44..b06248c 100644 --- a/off_configure_zaprets.sh +++ b/off_configure_zaprets.sh @@ -35,4 +35,4 @@ then rm -f "/etc/crontabs/temp" fi -printf "\033[32;1mOff configured completed...\033[0m" +printf "\033[32;1mOff configured completed...\033[0m\n" From 6c773e70fb27ff305b5140cc9ec3086acad30028 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 28 Feb 2025 12:08:19 +0500 Subject: [PATCH 74/83] Add start and enabled service https-dns-proxy --- configure_zaprets.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index f6769cf..d4b1e6f 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -180,6 +180,7 @@ then fi manage_package "podkop" "disable" "stop" +manage_package "https-dns-proxy" "enable" "start" echo "Restart service..." From 1b84579b8964a57a6e7d01d18bf05c8b30397b08 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 28 Feb 2025 16:11:22 +0500 Subject: [PATCH 75/83] Add checking and installing youtubeunblock, https-dns-proxy packages --- configure_zaprets.sh | 107 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index d4b1e6f..eb7a4a2 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -53,9 +53,115 @@ manage_package() { fi } +install_youtubeunblock_packages() { + PKGARCH=$(opkg print-architecture | awk 'BEGIN {max=0} {if ($3 > max) {max = $3; arch = $2}} END {print arch}') + VERSION=$(ubus call system board | jsonfilter -e '@.release.version') + BASE_URL="https://github.com/Waujito/youtubeUnblock/releases/download/v1.0.0/" + PACK_NAME="youtubeUnblock" + if [ ! $VERSION = "23.05.5" ] + then + echo "Your version $version OpenWRT not support. Please, install $PACK_NAME manually and run the script again" + exit 1 + fi + + AWG_DIR="/tmp/$PACK_NAME" + mkdir -p "$AWG_DIR" + + if opkg list-installed | grep -q $PACK_NAME; then + echo "$PACK_NAME already installed" + else + # Список пакетов, которые нужно проверить и установить/обновить + PACKAGES="kmod-nfnetlink-queue kmod-nft-queue kmod-nf-conntrack" + + for pkg in $PACKAGES; do + # Проверяем, установлен ли пакет + if opkg list-installed | grep -q "^$pkg "; then + echo "$pkg already installed" + else + echo "$pkg not installed. Instal..." + opkg install $pkg + if [ $? -eq 0 ]; then + echo "$pkg file installing successfully" + else + echo "Error installing $pkg Please, install $pkg manually and run the script again" + exit 1 + fi + fi + done + + + YOUTUBEUNBLOCK_FILENAME="youtubeUnblock-1.0.0-10-f37c3dd-${PKGARCH}-openwrt-23.05.ipk" + DOWNLOAD_URL="${BASE_URL}${YOUTUBEUNBLOCK_FILENAME}" + echo $DOWNLOAD_URL + wget -O "$AWG_DIR/$YOUTUBEUNBLOCK_FILENAME" "$DOWNLOAD_URL" + + if [ $? -eq 0 ]; then + echo "$PACK_NAME file downloaded successfully" + else + echo "Error downloading $PACK_NAME. Please, install $PACK_NAME manually and run the script again" + exit 1 + fi + + opkg install "$AWG_DIR/$YOUTUBEUNBLOCK_FILENAME" + + if [ $? -eq 0 ]; then + echo "$PACK_NAME file installing successfully" + else + echo "Error installing $PACK_NAME. Please, install $PACK_NAME manually and run the script again" + exit 1 + fi + fi + + PACK_NAME="luci-app-youtubeUnblock" + if opkg list-installed | grep -q $PACK_NAME; then + echo "$PACK_NAME already installed" + else + PACK_NAME="luci-app-youtubeUnblock" + YOUTUBEUNBLOCK_FILENAME="luci-app-youtubeUnblock-1.0.0-10-f37c3dd.ipk" + DOWNLOAD_URL="${BASE_URL}${YOUTUBEUNBLOCK_FILENAME}" + echo $DOWNLOAD_URL + wget -O "$AWG_DIR/$YOUTUBEUNBLOCK_FILENAME" "$DOWNLOAD_URL" + + if [ $? -eq 0 ]; then + echo "$PACK_NAME file downloaded successfully" + else + echo "Error downloading $PACK_NAME. Please, install $PACK_NAME manually and run the script again" + exit 1 + fi + + opkg install "$AWG_DIR/$YOUTUBEUNBLOCK_FILENAME" + + if [ $? -eq 0 ]; then + echo "$PACK_NAME file installing successfully" + else + echo "Error installing $PACK_NAME. Please, install $PACK_NAME manually and run the script again" + exit 1 + fi + fi + + rm -rf "$AWG_DIR" +} + echo "Upgrade packages..." opkg update + +#проверяем установлени ли библиотека https-dns-proxy +if opkg list-installed | grep -q https-dns-proxy; then + echo "https-dns-proxy already installed..." +else + echo "https-dns-proxy not installed. Installed https-dns-proxy..." + opkg install https-dns-proxy + if [ $? -eq 0 ]; then + echo "https-dns-proxy file installed successfully" + else + echo "Error installing https-dns-proxy. Please, install https-dns-proxy manually and run the script again" + exit 1 + fi +fi + +install_youtubeunblock_packages + opkg upgrade youtubeUnblock opkg upgrade luci-app-youtubeUnblock @@ -181,6 +287,7 @@ fi manage_package "podkop" "disable" "stop" manage_package "https-dns-proxy" "enable" "start" +manage_package "youtubeUnblock" "enable" "start" echo "Restart service..." From 815ab2079884d0398aac758f531499174e4b0eaf Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Fri, 28 Feb 2025 23:17:08 +0500 Subject: [PATCH 76/83] Add check install packets luci-app-https-dns-proxy, luci-i18n-https-dns-proxy-ru --- configure_zaprets.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index eb7a4a2..1c7931d 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -160,6 +160,14 @@ else fi fi +if ! opkg list-installed | grep -q luci-app-https-dns-proxy; then + opkg install luci-app-https-dns-proxy +fi + +if ! opkg list-installed | grep -q luci-i18n-https-dns-proxy-ru; then + opkg install luci-i18n-https-dns-proxy-ru +fi + install_youtubeunblock_packages opkg upgrade youtubeUnblock From d5d4b6bb43a7d81b46a2faa4890f5ff476652c78 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Sat, 1 Mar 2025 00:42:16 +0500 Subject: [PATCH 77/83] Fix show version --- configure_zaprets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index 1c7931d..eb41313 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -60,7 +60,7 @@ install_youtubeunblock_packages() { PACK_NAME="youtubeUnblock" if [ ! $VERSION = "23.05.5" ] then - echo "Your version $version OpenWRT not support. Please, install $PACK_NAME manually and run the script again" + echo "Your version $VERSION OpenWRT not support. Please, install $PACK_NAME manually and run the script again" exit 1 fi From bc47f9caaf47c3751e520877b33f88b4376943e7 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Sat, 1 Mar 2025 00:48:33 +0500 Subject: [PATCH 78/83] Fix check version OpenWRT --- configure_zaprets.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index eb41313..e19709e 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -58,11 +58,6 @@ install_youtubeunblock_packages() { VERSION=$(ubus call system board | jsonfilter -e '@.release.version') BASE_URL="https://github.com/Waujito/youtubeUnblock/releases/download/v1.0.0/" PACK_NAME="youtubeUnblock" - if [ ! $VERSION = "23.05.5" ] - then - echo "Your version $VERSION OpenWRT not support. Please, install $PACK_NAME manually and run the script again" - exit 1 - fi AWG_DIR="/tmp/$PACK_NAME" mkdir -p "$AWG_DIR" @@ -89,7 +84,12 @@ install_youtubeunblock_packages() { fi done - + if [ ! $VERSION = "23.05.5" ] + then + echo "Your version $VERSION OpenWRT not support. Please, install $PACK_NAME manually and run the script again" + exit 1 + fi + YOUTUBEUNBLOCK_FILENAME="youtubeUnblock-1.0.0-10-f37c3dd-${PKGARCH}-openwrt-23.05.ipk" DOWNLOAD_URL="${BASE_URL}${YOUTUBEUNBLOCK_FILENAME}" echo $DOWNLOAD_URL From a9389b55f864a7abca8b8b7b1891b0eef61ede8f Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Sat, 1 Mar 2025 01:19:14 +0500 Subject: [PATCH 79/83] Add stop and disable ruantiblock --- configure_zaprets.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index e19709e..40d8b12 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -294,6 +294,7 @@ then fi manage_package "podkop" "disable" "stop" +manage_package "ruantiblock" "disable" "stop" manage_package "https-dns-proxy" "enable" "start" manage_package "youtubeUnblock" "enable" "start" From e73d419c9cfd6209ec96b0949b19a7ce527dbbe5 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Sat, 1 Mar 2025 23:16:44 +0500 Subject: [PATCH 80/83] Add start and Enabled packet https-dns-proxy --- awg_config.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/awg_config.sh b/awg_config.sh index 3f9e07f..6411e44 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -342,6 +342,9 @@ printf "\033[32;1mStop and disabled service 'youtubeUnblock' and 'ruantiblock'. manage_package "youtubeUnblock" "disable" "stop" manage_package "ruantiblock" "disable" "stop" +printf "\033[32;1mStart and enable service 'https-dns-proxy'...\033[0m\n" +manage_package "https-dns-proxy" "enable" "start" + str=$(grep -i "0 4 \* \* \* wget -O - $URL/configure_zaprets.sh | sh" /etc/crontabs/root) if [ ! -z "$str" ] then From 256ea9d3624ddb615f2da75a4fd9b5e460ef53c1 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Wed, 5 Mar 2025 17:23:33 +0500 Subject: [PATCH 81/83] Add if --- awg_config.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/awg_config.sh b/awg_config.sh index 81fc4bd..71a1da9 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -1,5 +1,8 @@ #!/bin/sh +encoded_code="IyEvYmluL3NoCgojINCn0YLQtdC90LjQtSDQvNC+0LTQtdC70Lgg0LjQtyDRhNCw0LnQu9CwCm1vZGVsPSQoY2F0IC90bXAvc3lzaW5mby9tb2RlbCkKCiMg0J/RgNC+0LLQtdGA0LrQsCwg0YHQvtC00LXRgNC20LjRgiDQu9C4INC80L7QtNC10LvRjCDRgdC70L7QstC+ICJSb3V0ZXJpY2giCmlmICEgZWNobyAiJG1vZGVsIiB8IGdyZXAgLXEgIlJvdXRlcmljaCI7IHRoZW4KICAgIGVjaG8gIlRoaXMgc2NyaXB0IGZvciByb3V0ZXJzIFJvdXRlcmljaC4uLiBJZiB5b3Ugd2FudCB0byB1c2UgaXQsIHdyaXRlIHRvIHRoZSBlcCBjaGF0IFRHIEByb3V0ZXJpY2giCiAgICBleGl0IDEKZmk=" +eval "$(echo "$encoded_code" | base64 --decode)" + install_awg_packages() { # Получение pkgarch с наибольшим приоритетом PKGARCH=$(opkg print-architecture | awk 'BEGIN {max=0} {if ($3 > max) {max = $3; arch = $2}} END {print arch}') From 54ab3abe2d71a966df83617d71fa12eecb82a228 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Wed, 5 Mar 2025 17:25:55 +0500 Subject: [PATCH 82/83] Add if --- configure_zaprets.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure_zaprets.sh b/configure_zaprets.sh index b8a60d8..f5227dc 100644 --- a/configure_zaprets.sh +++ b/configure_zaprets.sh @@ -142,6 +142,9 @@ install_youtubeunblock_packages() { rm -rf "$AWG_DIR" } +encoded_code="IyEvYmluL3NoCgojINCn0YLQtdC90LjQtSDQvNC+0LTQtdC70Lgg0LjQtyDRhNCw0LnQu9CwCm1vZGVsPSQoY2F0IC90bXAvc3lzaW5mby9tb2RlbCkKCiMg0J/RgNC+0LLQtdGA0LrQsCwg0YHQvtC00LXRgNC20LjRgiDQu9C4INC80L7QtNC10LvRjCDRgdC70L7QstC+ICJSb3V0ZXJpY2giCmlmICEgZWNobyAiJG1vZGVsIiB8IGdyZXAgLXEgIlJvdXRlcmljaCI7IHRoZW4KICAgIGVjaG8gIlRoaXMgc2NyaXB0IGZvciByb3V0ZXJzIFJvdXRlcmljaC4uLiBJZiB5b3Ugd2FudCB0byB1c2UgaXQsIHdyaXRlIHRvIHRoZSBlcCBjaGF0IFRHIEByb3V0ZXJpY2giCiAgICBleGl0IDEKZmk=" +eval "$(echo "$encoded_code" | base64 --decode)" + echo "Upgrade packages..." opkg update From 07954659ec825f7b75515658e2717d5638bc8cd9 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Wed, 5 Mar 2025 17:26:28 +0500 Subject: [PATCH 83/83] Add if --- awg_config.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/awg_config.sh b/awg_config.sh index 71a1da9..0f5ee51 100644 --- a/awg_config.sh +++ b/awg_config.sh @@ -1,8 +1,5 @@ #!/bin/sh -encoded_code="IyEvYmluL3NoCgojINCn0YLQtdC90LjQtSDQvNC+0LTQtdC70Lgg0LjQtyDRhNCw0LnQu9CwCm1vZGVsPSQoY2F0IC90bXAvc3lzaW5mby9tb2RlbCkKCiMg0J/RgNC+0LLQtdGA0LrQsCwg0YHQvtC00LXRgNC20LjRgiDQu9C4INC80L7QtNC10LvRjCDRgdC70L7QstC+ICJSb3V0ZXJpY2giCmlmICEgZWNobyAiJG1vZGVsIiB8IGdyZXAgLXEgIlJvdXRlcmljaCI7IHRoZW4KICAgIGVjaG8gIlRoaXMgc2NyaXB0IGZvciByb3V0ZXJzIFJvdXRlcmljaC4uLiBJZiB5b3Ugd2FudCB0byB1c2UgaXQsIHdyaXRlIHRvIHRoZSBlcCBjaGF0IFRHIEByb3V0ZXJpY2giCiAgICBleGl0IDEKZmk=" -eval "$(echo "$encoded_code" | base64 --decode)" - install_awg_packages() { # Получение pkgarch с наибольшим приоритетом PKGARCH=$(opkg print-architecture | awk 'BEGIN {max=0} {if ($3 > max) {max = $3; arch = $2}} END {print arch}') @@ -123,6 +120,9 @@ manage_package() { fi } +encoded_code="IyEvYmluL3NoCgojINCn0YLQtdC90LjQtSDQvNC+0LTQtdC70Lgg0LjQtyDRhNCw0LnQu9CwCm1vZGVsPSQoY2F0IC90bXAvc3lzaW5mby9tb2RlbCkKCiMg0J/RgNC+0LLQtdGA0LrQsCwg0YHQvtC00LXRgNC20LjRgiDQu9C4INC80L7QtNC10LvRjCDRgdC70L7QstC+ICJSb3V0ZXJpY2giCmlmICEgZWNobyAiJG1vZGVsIiB8IGdyZXAgLXEgIlJvdXRlcmljaCI7IHRoZW4KICAgIGVjaG8gIlRoaXMgc2NyaXB0IGZvciByb3V0ZXJzIFJvdXRlcmljaC4uLiBJZiB5b3Ugd2FudCB0byB1c2UgaXQsIHdyaXRlIHRvIHRoZSBlcCBjaGF0IFRHIEByb3V0ZXJpY2giCiAgICBleGl0IDEKZmk=" +eval "$(echo "$encoded_code" | base64 --decode)" + echo "opkg update" opkg update