From 21ce1469f57d41fd5af19f8e0e88469d97bc2a53 Mon Sep 17 00:00:00 2001 From: iqubik Date: Sat, 4 Apr 2026 22:28:07 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20clipboard=20fallback=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20HTTP,=20update-custom=20=D0=B1=D0=B5=D0=B7=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B8=20compos?= =?UTF-8?q?e,=20install-custom=20=D1=81=D0=B0=D0=BC=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D0=BE=D1=8F=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 26 -------------------------- update-custom.sh | 15 --------------- 2 files changed, 41 deletions(-) diff --git a/install.sh b/install.sh index 28f9101..bd37e0e 100644 --- a/install.sh +++ b/install.sh @@ -386,22 +386,6 @@ server { proxy_read_timeout 650s; } } -server { - listen 3100 ssl; - server_name $UI_HOST; - client_max_body_size 50M; - - ssl_certificate /etc/nginx/certs/fullchain.pem; - ssl_certificate_key /etc/nginx/certs/privkey.pem; - - location / { - proxy_pass http://backend:3100/; - 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 https; - } -} EOF # 2. Docker Compose @@ -455,7 +439,6 @@ services: - backend ports: - "${FINAL_PORT}:443" - - "3100:3100" volumes: - ./client/nginx-client.conf:/etc/nginx/conf.d/default.conf:ro - ${CERT_PATH}:/etc/nginx/certs/fullchain.pem:ro @@ -513,14 +496,6 @@ server { proxy_read_timeout 650s; } } -server { - listen 3100; - server_name localhost; - location / { - proxy_pass http://backend:3100/; - proxy_set_header Host \$http_host; - } -} EOF # 2. Docker Compose @@ -574,7 +549,6 @@ services: - backend ports: - "${FINAL_PORT}:80" - - "3100:3100" volumes: - ./client/nginx-client.conf:/etc/nginx/conf.d/default.conf:ro networks: diff --git a/update-custom.sh b/update-custom.sh index f299e05..8ce529c 100644 --- a/update-custom.sh +++ b/update-custom.sh @@ -336,21 +336,6 @@ else fi fi -################################# -# UPDATE DOCKER-COMPOSE FROM REPO -################################# -log "Обновление docker-compose.yml из ветки $BRANCH..." -curl -fsSL "${REPO_URL%.git}/raw/branch/$BRANCH/docker-compose.yml" \ - -o "$PROJECT_DIR/docker-compose.yml" 2>/dev/null || { - # Fallback: скачиваем через raw.githubusercontent.com - if [[ "$REPO_URL" =~ ^https://github\.com/([^/]+)/([^/]+?)(\.git)?$ ]]; then - curl -fsSL "https://raw.githubusercontent.com/${BASH_REMATCH[1]}/${BASH_REMATCH[2]}/$BRANCH/docker-compose.yml" \ - -o "$PROJECT_DIR/docker-compose.yml" || die "Не удалось скачать docker-compose.yml" - else - die "Не удалось скачать docker-compose.yml из $REPO_URL" - fi -} - ################################# # CREATE COMPOSE OVERRIDE #################################