diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index b50b509..1b46c91 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -2,7 +2,7 @@ name: Docker Build & Publish on: push: - branches: [ "main", "dp-new-release" ] + branches: [ "main" ] workflow_dispatch: env: diff --git a/install.sh b/install.sh index 51e5a7b..009a5e1 100644 --- a/install.sh +++ b/install.sh @@ -6,7 +6,7 @@ set -euo pipefail ################################# PROJECT_DIR="/opt/3dp-manager" DOCKER_USER="denpiligrim" -DOCKER_TAG="dp-new-release" +DOCKER_TAG="main" IMAGE_SERVER="ghcr.io/${DOCKER_USER}/3dp-manager-server:${DOCKER_TAG}" IMAGE_CLIENT="ghcr.io/${DOCKER_USER}/3dp-manager-client:${DOCKER_TAG}" @@ -456,6 +456,7 @@ server { proxy_set_header Host \$http_host; proxy_set_header X-Real-IP \$remote_addr; proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto \$scheme; proxy_connect_timeout 10s; proxy_send_timeout 650s; proxy_read_timeout 650s; @@ -566,6 +567,7 @@ server { proxy_cache_bypass \$http_upgrade; proxy_set_header X-Real-IP \$remote_addr; proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto \$scheme; proxy_connect_timeout 10s; proxy_send_timeout 650s; proxy_read_timeout 650s; diff --git a/server/src/tunnels/tunnels.service.ts b/server/src/tunnels/tunnels.service.ts index faac29f..1ba1a2f 100644 --- a/server/src/tunnels/tunnels.service.ts +++ b/server/src/tunnels/tunnels.service.ts @@ -55,7 +55,7 @@ export class TunnelsService { `Начинаем установку редиректа на ${tunnel.ip} -> ${mainServerIp}`, ); - const command = `sudo ORIGIN_IP="${mainServerIp}" bash -c "$(curl -sSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/dp-new-release/forwarding_install.sh)"`; + const command = `sudo ORIGIN_IP="${mainServerIp}" bash -c "$(curl -sSL https://raw.githubusercontent.com/denpiligrim/3dp-manager/main/forwarding_install.sh)"`; try { const output = await this.sshService.executeCommand(