diff --git a/README.md b/README.md index cebc793..c40ac99 100644 --- a/README.md +++ b/README.md @@ -61,11 +61,11 @@ ## Установка -У вас должны быть установлены пакеты на сервере: `curl`, `jq` и панель управления `3x-ui`, которую можно установить командой: `bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh)` +У вас должны быть установлены пакеты на сервере `curl`, `jq` командой: `apt install curl jq` и панель управления `3x-ui`, которую можно установить командой: `bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh)` Установите проект на сервер командой: ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/install.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/install.sh) ``` Краткое описание: запускает скрипт установки и разворачивает контейнеры и сервисы. @@ -75,7 +75,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f Обновление до последней версии: ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/update.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/update.sh) ``` Краткое описание: подтягивает последние изменения и перезапускает контейнеры. @@ -85,7 +85,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f Полное удаление сервиса: ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/delete.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/delete.sh) ``` Краткое описание: удаляет контейнеры и файлы конфигурации, возвращая систему к состоянию до установки. @@ -94,10 +94,13 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f ## Установка сервиса перенаправления (forwarding) +> [!WARNING] +> Сервис перенаправления работает на промежуточном сервере. + Сервис перенаправления позволяет проксировать входящие порты с промежуточного сервера на основной. ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/forwarding_install.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/forwarding_install.sh) ``` Краткое описание: добавляет правила перенаправления и создает сервис для обновления подписки. @@ -105,7 +108,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f ## Удаление перенаправления ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/forwarding_delete.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/forwarding_delete.sh) ``` Краткое описание: удаляет правила и отключает сервис перенаправления. diff --git a/README_CN.md b/README_CN.md index 9915fd4..dbd90c4 100644 --- a/README_CN.md +++ b/README_CN.md @@ -61,7 +61,7 @@ 在服务器上运行以下命令安装项目: ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/install.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/install.sh) ``` 简要说明:运行安装脚本并部署容器和服务。 @@ -71,7 +71,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f 更新到最新版本: ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/update.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/update.sh) ``` 简要说明:拉取最新更改并重启容器。 @@ -81,7 +81,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f 彻底删除服务: ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/delete.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/delete.sh) ``` 简要说明:删除容器和配置文件,恢复到安装前状态。 @@ -93,7 +93,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f 转发服务允许将中继服务器的入站端口代理到主服务器。 ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/forwarding_install.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/forwarding_install.sh) ``` 简要说明:添加转发规则并创建用于更新订阅的服务。 @@ -101,7 +101,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f ## 删除转发 ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/forwarding_delete.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/forwarding_delete.sh) ``` 简要说明:删除规则并禁用转发服务。 diff --git a/README_EN.md b/README_EN.md index 6b9bd28..d6de078 100644 --- a/README_EN.md +++ b/README_EN.md @@ -61,7 +61,7 @@ Recommendations: Install the project on your server with: ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/install.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/install.sh) ``` Short description: runs the installer script and deploys containers and services. @@ -71,7 +71,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f Update to the latest version: ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/update.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/update.sh) ``` Short description: pulls the latest changes and restarts containers. @@ -81,7 +81,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f Remove the service completely: ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/delete.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/delete.sh) ``` Short description: removes containers and configuration files, restoring the system to the pre-install state. @@ -93,7 +93,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f The forwarding service allows proxying incoming ports from the intermediate server to the main server. ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/forwarding_install.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/forwarding_install.sh) ``` Short description: adds forwarding rules and creates a service to update the subscription. @@ -101,7 +101,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f ## Remove forwarding ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/forwarding_delete.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/forwarding_delete.sh) ``` Short description: removes rules and disables the forwarding service. diff --git a/README_IR.md b/README_IR.md index 81ee994..e573987 100644 --- a/README_IR.md +++ b/README_IR.md @@ -61,7 +61,7 @@ برای نصب پروژه در سرور، دستور زیر را اجرا کنید: ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/install.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/install.sh) ``` توضیح کوتاه: اسکریپت نصب را اجرا کرده و کانتینرها و سرویس‌ها را راه‌اندازی می‌کند. @@ -71,7 +71,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f برای به‌روزرسانی به آخرین نسخه: ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/update.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/update.sh) ``` توضیح کوتاه: تغییرات جدید را می‌کشد و کانتینرها را ری‌استارت می‌کند. @@ -81,7 +81,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f برای حذف کامل سرویس: ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/delete.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/delete.sh) ``` توضیح کوتاه: کانتینرها و فایل‌های پیکربندی را حذف می‌کند و سیستم را به وضعیت پیش از نصب برمی‌گرداند. @@ -93,7 +93,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f سرویس فورواردینگ امکان پراکسی کردن پورت‌های ورودی از سرور واسط به سرور اصلی را فراهم می‌کند. ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/forwarding_install.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/forwarding_install.sh) ``` توضیح کوتاه: قوانین فورواردینگ را اضافه کرده و سرویسی برای به‌روزرسانی اشتراک ایجاد می‌کند. @@ -101,7 +101,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f ## حذف فورواردینگ ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/forwarding_delete.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/forwarding_delete.sh) ``` توضیح کوتاه: قوانین را حذف کرده و سرویس فورواردینگ را غیرفعال می‌کند. diff --git a/README_TK.md b/README_TK.md index 2bdca0f..18545bc 100644 --- a/README_TK.md +++ b/README_TK.md @@ -61,7 +61,7 @@ Maslahatchylyklar: Taslamany serwera gurnamak üçin şu komandany ýerine ýetiriň: ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/install.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/install.sh) ``` Gysgaça: gurnama skripti işledilýär we konteýnerler we hyzmatlar döredilýär. @@ -71,7 +71,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f Soňky wersiýa çenli täzeläň: ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/update.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/update.sh) ``` Gysgaça: iň soňky üýtgeşmeleri çekýär we konteýnerleri gaýtadan işledýär. @@ -81,7 +81,7 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f Hyzmaty doly pozmak üçin: ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/delete.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/delete.sh) ``` Gysgaça: konteýnerleri we konfigurasiýa faýllaryny pozup, systemany gurnamadan öňki ýagdaýyna getirer. @@ -93,13 +93,13 @@ bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-f Forwarding hyzmaty aragatnaşyk serwerinden esasy servere gelýän portlary proxy arkaly geçirýär. ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/forwarding_install.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/forwarding_install.sh) ``` ## Forwarding-i pozmak ```bash -bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/forwarding_delete.sh) +bash <(curl -fsSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/forwarding_delete.sh) ``` --- diff --git a/app/index.js b/app/index.js index 8d221e4..0ef17cc 100644 --- a/app/index.js +++ b/app/index.js @@ -24,7 +24,7 @@ api.interceptors.request.use(config => { }); const WHITELIST_FILE = "/app/whitelist.txt"; -const WHITELIST_REPO_URL = "https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix/whitelist.txt"; +const WHITELIST_REPO_URL = "https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/whitelist.txt"; // Helper functions async function updateWhitelist() { diff --git a/forwarding_install.sh b/forwarding_install.sh index 6593196..c5e1d5b 100644 --- a/forwarding_install.sh +++ b/forwarding_install.sh @@ -115,7 +115,7 @@ cd "$BASE_DIR" ################################# # DOWNLOAD FILES ################################# -REPO="https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix" +REPO="https://raw.githubusercontent.com/denpiligrim/3dp-manager/main" NGINX_PORT=$ORIGIN_PORT if [[ "$USE_HTTPS" == "true" ]]; then NGINX_PROTO="https" diff --git a/install.sh b/install.sh index 3a94949..c5733aa 100644 --- a/install.sh +++ b/install.sh @@ -147,7 +147,7 @@ cd "$PROJECT_DIR" ################################# # Get country flag ################################# -REPO_BASE="https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix" +REPO_BASE="https://raw.githubusercontent.com/denpiligrim/3dp-manager/main" COUNTRY_FLAG="" # Get countryCode diff --git a/update.sh b/update.sh index 45bb002..3b4eda0 100644 --- a/update.sh +++ b/update.sh @@ -27,7 +27,7 @@ fi # CONFIG ################################# PROJECT_DIR="/opt/3dp-manager" -REPO_RAW="https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-fix" +REPO_RAW="https://raw.githubusercontent.com/denpiligrim/3dp-manager/main" ################################# # START