From dbc38bb14231281bd676a7bfc1bfc10ebd1e4236 Mon Sep 17 00:00:00 2001 From: Den Piligrim <89912505+vasiljevdenis@users.noreply.github.com> Date: Thu, 25 Dec 2025 22:47:22 +0300 Subject: [PATCH] preparation for release --- README.md | 10 +++++----- README_CN.md | 10 +++++----- README_EN.md | 10 +++++----- README_IR.md | 10 +++++----- README_TK.md | 10 +++++----- app/docker-compose.example.yml | 1 + app/index.js | 2 +- app/nginx.example.conf | 2 ++ forwarding_install.sh | 2 +- install.sh | 2 +- update.sh | 2 +- 11 files changed, 32 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 6477b93..4e7cd6b 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,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) ``` Краткое описание: запускает скрипт установки и разворачивает контейнеры и сервисы. @@ -72,7 +72,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) ``` Краткое описание: подтягивает последние изменения и перезапускает контейнеры. @@ -82,7 +82,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,7 +94,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) ``` Краткое описание: добавляет правила перенаправления и создает сервис для обновления подписки. @@ -102,7 +102,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 5740aad..e4d0b75 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 e37473a..42919be 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 22dd4ef..f65de74 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 656e48e..7b5617e 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/docker-compose.example.yml b/app/docker-compose.example.yml index f33bc59..89f7014 100644 --- a/app/docker-compose.example.yml +++ b/app/docker-compose.example.yml @@ -9,6 +9,7 @@ services: nginx: image: nginx:alpine + restart: unless-stopped depends_on: [node] ports: - "80:80" diff --git a/app/index.js b/app/index.js index e1435a2..56afa2e 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/app/nginx.example.conf b/app/nginx.example.conf index fcdc8a1..fd75cc9 100644 --- a/app/nginx.example.conf +++ b/app/nginx.example.conf @@ -7,6 +7,8 @@ http { location = /bus/$SUB_TOKEN { alias /subscriptions/list.txt; default_type text/plain; + add_header Subscription-Userinfo "upload=0; download=0; total=109951162777600; expire=0" always; + add_header Access-Control-Allow-Origin *; } location / { diff --git a/forwarding_install.sh b/forwarding_install.sh index 916831e..debc6fd 100644 --- a/forwarding_install.sh +++ b/forwarding_install.sh @@ -109,7 +109,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 240fdcc..686b977 100644 --- a/install.sh +++ b/install.sh @@ -128,7 +128,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 164b984..e44211e 100644 --- a/update.sh +++ b/update.sh @@ -21,7 +21,7 @@ need_root() { # 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