From af07a48fa2b3320084b45bb61420eb31eae3aac4 Mon Sep 17 00:00:00 2001 From: miscud91 Date: Fri, 16 May 2025 22:08:56 +0500 Subject: [PATCH 1/6] Update Dockerfile --- Dockerfile | 46 ++++++++-------------------------------------- 1 file changed, 8 insertions(+), 38 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f4db3f..ae2bd5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,42 +1,12 @@ -FROM debian:latest +# Используем nginx:alpine как базовый образ +FROM nginx:alpine -ARG MODULE=ngx_http_proxy_connect_module -ARG VERSION=1.19.3 -ARG PREFIX=/etc/nginx -# Required packages -RUN set -eux; \ - apt-get update; \ - apt-get install --no-install-recommends --no-install-suggests -y \ - ca-certificates git wget \ - build-essential libssl-dev libpcre3-dev zlib1g-dev; \ - rm -rf /var/lib/apt/lists/* +# Удаляем конфигурацию по умолчанию +RUN rm /etc/nginx/conf.d/default.conf -# Build nginx -WORKDIR /usr/src/ -RUN set -eux; \ - git clone https://github.com/chobits/$MODULE; \ - wget http://nginx.org/download/nginx-$VERSION.tar.gz; \ - tar xzf nginx-$VERSION.tar.gz; \ - cd nginx-$VERSION; \ - patch -p1 < ../$MODULE/patch/proxy_connect_rewrite_1018.patch; \ - ./configure \ - --prefix=$PREFIX --sbin-path=/usr/bin \ - --with-threads \ - --with-http_ssl_module --add-module=../$MODULE; \ - make; \ - make install; \ - make clean; \ - cd -; \ - rm -rf ./* - -# Logging -RUN set -eux; \ - ln -sf /dev/stdout $PREFIX/logs/access.log; \ - ln -sf /dev/stderr $PREFIX/logs/error.log +# Копируем наш конфигурационный файл в нужную директорию +COPY nginx.conf /etc/nginx/conf.d/nginx.conf -EXPOSE 80 - -STOPSIGNAL SIGQUIT - -CMD ["nginx", "-g", "daemon off;"] +# Открываем порт 80 +EXPOSE 8080 From 84eb405a3cb7a7e58660dbe361be41e44bb73895 Mon Sep 17 00:00:00 2001 From: miscud91 Date: Fri, 16 May 2025 22:09:34 +0500 Subject: [PATCH 2/6] Update nginx.conf --- conf/nginx.conf | 55 ++++++++++--------------------------------------- 1 file changed, 11 insertions(+), 44 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 095a9e9..6343683 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,46 +1,13 @@ -events {} - -worker_processes 5; - -http { - server { - listen 80; - - # DNS servers - include resolver.conf; - - # Allow direct connections - proxy_connect; - proxy_connect_read_timeout 30s; - proxy_connect_send_timeout 30s; - proxy_ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; - - # Permissive: no common web server ports bypass - # proxy_connect 1-79 81-8079 8081-65535; - # Restrictive: just default HTTPS port - proxy_connect_allow 443; - - # Defaults to HTTPS - location / { - # Fallback to original connection scheme - error_page 502 = @fallback; - - # Will only upgrade HTTP - if ($scheme != "http") { - return 502; - } - - # Generated HTTPS bypass whitelist - include bypass/all.conf; - - proxy_pass https://$http_host; - include proxy.conf; - } - - location @fallback { - # Proxy any scheme - proxy_pass $scheme://$http_host; - include proxy.conf; - } +server { + listen 8080; + + location / { + proxy_pass http://77.91.87.151:80; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; } } + + From dede8176c04fb2cde8716b5660059a1348a0724e Mon Sep 17 00:00:00 2001 From: miscud91 Date: Fri, 16 May 2025 22:11:49 +0500 Subject: [PATCH 3/6] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6343683..998ec36 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ server { listen 8080; location / { - proxy_pass http://77.91.87.151:80; + proxy_pass http://91.84.100.81:80; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; From ecb3a818df907ac13bcc5f4899c31d96749149bd Mon Sep 17 00:00:00 2001 From: miscud91 Date: Fri, 16 May 2025 22:14:54 +0500 Subject: [PATCH 4/6] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ae2bd5a..22ef575 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,10 +3,10 @@ FROM nginx:alpine # Удаляем конфигурацию по умолчанию -RUN rm /etc/nginx/conf.d/default.conf +#RUN rm /etc/nginx/conf.d/default.conf # Копируем наш конфигурационный файл в нужную директорию -COPY nginx.conf /etc/nginx/conf.d/nginx.conf +#COPY nginx.conf /etc/nginx/conf.d/nginx.conf # Открываем порт 80 EXPOSE 8080 From 3efbbcfd5c957621dbf24f8e73c0a6f452d379aa Mon Sep 17 00:00:00 2001 From: miscud91 Date: Fri, 16 May 2025 22:16:05 +0500 Subject: [PATCH 5/6] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 22ef575..d1494e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,10 +3,10 @@ FROM nginx:alpine # Удаляем конфигурацию по умолчанию -#RUN rm /etc/nginx/conf.d/default.conf +RUN rm /etc/nginx/conf.d/default.conf # Копируем наш конфигурационный файл в нужную директорию -#COPY nginx.conf /etc/nginx/conf.d/nginx.conf +COPY conf/nginx.conf /etc/nginx/conf.d/nginx.conf # Открываем порт 80 EXPOSE 8080 From 1287b5b82184c82423dcb27b1ba73aa565d6823c Mon Sep 17 00:00:00 2001 From: "Fly.io" Date: Tue, 20 May 2025 15:06:01 +0000 Subject: [PATCH 6/6] New files from Fly.io Launch --- fly.toml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 fly.toml diff --git a/fly.toml b/fly.toml new file mode 100644 index 0000000..7ca7886 --- /dev/null +++ b/fly.toml @@ -0,0 +1,23 @@ +# fly.toml app configuration file generated for https-upgrader on 2025-05-20T15:04:44Z +# +# See https://fly.io/docs/reference/configuration/ for information about how to use this file. +# + +app = 'https-upgrader' +primary_region = 'ams' + +[build] + +[http_service] + internal_port = 8080 + force_https = true + auto_stop_machines = 'stop' + auto_start_machines = true + min_machines_running = 0 + processes = ['app'] + +[[vm]] + memory = '1gb' + cpu_kind = 'shared' + cpus = 1 + memory_mb = 1024