diff --git a/README.md b/README.md index b1f97c7..d3793c4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

3dp-manager preview

-![Version](https://img.shields.io/badge/version-1.0.2-blue.svg) [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0) [![Telegram](https://img.shields.io/badge/Telegram-26A5E4?style=flat&logo=telegram&logoColor=white)](https://t.me/denpiligrim_web) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCOv2tFFYDY4mXOM60PVz8zw)](https://www.youtube.com/@denpiligrim) +![Version](https://img.shields.io/badge/version-2.0.0-blue.svg) [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0) [![Telegram](https://img.shields.io/badge/Telegram-26A5E4?style=flat&logo=telegram&logoColor=white)](https://t.me/denpiligrim_web) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCOv2tFFYDY4mXOM60PVz8zw)](https://www.youtube.com/@denpiligrim) # 3DP-MANAGER diff --git a/README_CN.md b/README_CN.md index ffbeb83..d658528 100644 --- a/README_CN.md +++ b/README_CN.md @@ -2,7 +2,7 @@

3dp-manager preview

-![Version](https://img.shields.io/badge/version-1.0.2.1-blue.svg) [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0) [![Telegram](https://img.shields.io/badge/Telegram-26A5E4?style=flat&logo=telegram&logoColor=white)](https://t.me/denpiligrim_web) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCOv2tFFYDY4mXOM60PVz8zw)](https://www.youtube.com/@denpiligrim) +![Version](https://img.shields.io/badge/version-2.0.0-blue.svg) [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0) [![Telegram](https://img.shields.io/badge/Telegram-26A5E4?style=flat&logo=telegram&logoColor=white)](https://t.me/denpiligrim_web) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCOv2tFFYDY4mXOM60PVz8zw)](https://www.youtube.com/@denpiligrim) # 3DP-MANAGER diff --git a/README_EN.md b/README_EN.md index 6f86786..61d56e6 100644 --- a/README_EN.md +++ b/README_EN.md @@ -2,7 +2,7 @@

3dp-manager preview

-![Version](https://img.shields.io/badge/version-1.0.2-blue.svg) [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0) [![Telegram](https://img.shields.io/badge/Telegram-26A5E4?style=flat&logo=telegram&logoColor=white)](https://t.me/denpiligrim_web) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCOv2tFFYDY4mXOM60PVz8zw)](https://www.youtube.com/@denpiligrim) +![Version](https://img.shields.io/badge/version-2.0.0-blue.svg) [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0) [![Telegram](https://img.shields.io/badge/Telegram-26A5E4?style=flat&logo=telegram&logoColor=white)](https://t.me/denpiligrim_web) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCOv2tFFYDY4mXOM60PVz8zw)](https://www.youtube.com/@denpiligrim) # 3DP-MANAGER diff --git a/README_IR.md b/README_IR.md index fa84383..43983c5 100644 --- a/README_IR.md +++ b/README_IR.md @@ -2,7 +2,7 @@

3dp-manager preview

-![Version](https://img.shields.io/badge/version-1.0.2-blue.svg) [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0) [![Telegram](https://img.shields.io/badge/Telegram-26A5E4?style=flat&logo=telegram&logoColor=white)](https://t.me/denpiligrim_web) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCOv2tFFYDY4mXOM60PVz8zw)](https://www.youtube.com/@denpiligrim) +![Version](https://img.shields.io/badge/version-2.0.0-blue.svg) [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0) [![Telegram](https://img.shields.io/badge/Telegram-26A5E4?style=flat&logo=telegram&logoColor=white)](https://t.me/denpiligrim_web) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCOv2tFFYDY4mXOM60PVz8zw)](https://www.youtube.com/@denpiligrim) # 3DP-MANAGER diff --git a/README_TK.md b/README_TK.md index 70cf6d8..b7e9a3c 100644 --- a/README_TK.md +++ b/README_TK.md @@ -2,7 +2,7 @@

3dp-manager preview

-![Version](https://img.shields.io/badge/version-1.0.2-blue.svg) [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0) [![Telegram](https://img.shields.io/badge/Telegram-26A5E4?style=flat&logo=telegram&logoColor=white)](https://t.me/denpiligrim_web) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCOv2tFFYDY4mXOM60PVz8zw)](https://www.youtube.com/@denpiligrim) +![Version](https://img.shields.io/badge/version-2.0.0-blue.svg) [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0) [![Telegram](https://img.shields.io/badge/Telegram-26A5E4?style=flat&logo=telegram&logoColor=white)](https://t.me/denpiligrim_web) [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCOv2tFFYDY4mXOM60PVz8zw)](https://www.youtube.com/@denpiligrim) # 3DP-MANAGER diff --git a/install.sh b/install.sh index 6461908..a3c9226 100644 --- a/install.sh +++ b/install.sh @@ -4,7 +4,7 @@ set -euo pipefail ################################# # КОНФИГУРАЦИЯ И ПЕРЕМЕННЫЕ ################################# -REPO_URL="https://github.com/denpiligrim/3dp-manager/archive/refs/heads/dp-gui.tar.gz" +REPO_URL="https://github.com/denpiligrim/3dp-manager/archive/refs/heads/main.tar.gz" PROJECT_DIR="/opt/3dp-manager" # Цвета для вывода diff --git a/server/src/tunnels/tunnels.service.ts b/server/src/tunnels/tunnels.service.ts index 30362fb..cfc06cb 100644 --- a/server/src/tunnels/tunnels.service.ts +++ b/server/src/tunnels/tunnels.service.ts @@ -48,7 +48,7 @@ export class TunnelsService { this.logger.log(`Начинаем установку редиректа на ${tunnel.ip} -> ${mainServerIp}`); - const command = `export ORIGIN_IP="${mainServerIp}" && bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-gui/forwarding_install.sh)`; + const command = `export ORIGIN_IP="${mainServerIp}" && bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/forwarding_install.sh)`; try { const output = await this.sshService.executeCommand({ diff --git a/whitelist.txt b/whitelist.txt index e825d34..c6eb8b9 100644 --- a/whitelist.txt +++ b/whitelist.txt @@ -1,100 +1,10 @@ -ir.ozone.ru -ozon.ru -refersion.com -st.ozone.ru -stats.vk-portal.net -www.vk.com -ads.x5.ru -api-maps.yandex.ru -career.ozon.ru -dancer.sbrf-cdn342.ru -egress.yandex.net -eh.vk.com -eh.vk.ru -google.com -ign.com -ir-2.ozone.ru -m.ok.com -m.vk.com -max.ru -music.yandex.ru -news.ufa-help.ru -ob06vexvjl.a.trbcdn.net -static.rutube.ru -sun6-21.userapi.com -sun6-22.userapi.com -sun9-38.userapi.com -tradingview.com -travel.yandex.ru -tvdesign.ru -vk.com -vkvideo.ru -ws.fjdjdjfjd.icu -www.rutube.ru -www.vkvideo.ru -xverager2.uspn.io ya.ru -01.img.avito.st -0ru84.tcpdoor.net -aliusfilms.ru -api.avito.ru -azizoarjmand.info -breeze.mos-drywall.shop -breeze.my-rebar.shop -cdn.tbank.ru -content.fasssst.ru -download.cdn.yandex.net -es5.fasssst.online -fin1.nfnpx.online -fr1.nfnpx.online -ger1.nfnpx.online -ger2.nfnpx.online -ger3.nfnpx.online -ger4.nfnpx.online -hkg.tunnelguard.ru -hls-svod.itunes.apple.com -i2pd.website -j1p.1gb.site -khabarovsk.geodema.network -kz1.nfnpx.online -max3.skystreamgame.com -maxru.outlinekeys.net -miro.com -my-rebar.shop -nl1.nfnpx.online -nsk.geodema.network -ovhwuxian.pai50288.uk -pl1.nfnpx.online -plb.tunnelguard.ru -res.fasssst.ru -ru2.nfnpx.online +vk.com +ok.ru +gosuslugi.ru +ozon.ru +max.ru +vkvideo.ru rutube.ru -sni.111000.dynv6.net -statue.lnmarketplace.net -sun6-20.userapi.com -tbankru.outlinekeys.net -tunnel.vk-apps.com -turkmenistan.gov.tm -usa1.nfnpx.online -veraams2.uspn.io -verager2.uspn.io -verahk1.uspn.io -verakz1.uspn.io -verarussia1.uspn.io -vk.ookcdn.ru -vless.hubp.de -web.max.ru -wechat.com -workerr.schodog1.workers.dev -www.cloudflare.com -www.google.com -www.ietf.org -www.kinopoisk.ru -www.mozilla.org -www.ozon.ru -xfer.mos-drywall.shop -xfer.my-rebar.shop -xverakz1.uspn.io -xverarussia1.uspn.io -yahoo.com -yt.fasssst.ru \ No newline at end of file +kinopoisk.ru +avito.ru \ No newline at end of file