diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ccd10c..352e87b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [0.6.12] - 2025-10-05 + +### 🔧 FIX: Duplicate Nginx Upstream Error +- **✅ Исправлен nginx конфиг**: Убрано дублирование `upstream quoter-8080` + - **Проблема**: `nginx: [emerg] duplicate upstream "quoter-8080"` + - **Причина**: upstream определялся дважды - в цикле и после него + - **Решение**: Вынесли `{{ end }}` раньше, чтобы upstream создавался только один раз + - **Файлы**: `nginx.conf.sigil` строка 148 + - 🚀 Деплой успешен, CDN работает стабильно + ## [0.6.11] - 2025-10-05 ### 🔧 FIX: Nginx 413 Content Too Large diff --git a/nginx.conf.sigil b/nginx.conf.sigil index 080bbb2..7de6b8f 100644 --- a/nginx.conf.sigil +++ b/nginx.conf.sigil @@ -6,155 +6,159 @@ {{ if eq $scheme "http" }} server { - listen [::]:{{ $listen_port }}; - listen {{ $listen_port }}; - {{ if $.NOSSL_SERVER_NAME }}server_name {{ $.NOSSL_SERVER_NAME }}; {{ end }} - access_log /var/log/nginx/{{ $.APP }}-access.log; - error_log /var/log/nginx/{{ $.APP }}-error.log; + listen [::]:{{ $listen_port }}; + listen {{ $listen_port }}; + {{ if $.NOSSL_SERVER_NAME }}server_name {{ $.NOSSL_SERVER_NAME }}; {{ end }} + access_log /var/log/nginx/{{ $.APP }}-access.log; + error_log /var/log/nginx/{{ $.APP }}-error.log; - # Увеличенные лимиты для загрузки файлов - client_max_body_size 500M; - client_body_timeout 300s; - client_header_timeout 300s; - - # Увеличенные buffer размеры - client_body_buffer_size 1M; - client_header_buffer_size 4k; - large_client_header_buffers 8 8k; + # Увеличенные лимиты для загрузки файлов + client_max_body_size 500M; + client_body_timeout 300s; + client_header_timeout 300s; + + # Увеличенные buffer размеры + client_body_buffer_size 1M; + client_header_buffer_size 4k; + large_client_header_buffers 8 8k; - # Timeouts для больших файлов - proxy_connect_timeout 300s; - proxy_send_timeout 300s; - proxy_read_timeout 300s; - send_timeout 300s; + # Timeouts для больших файлов + proxy_connect_timeout 300s; + proxy_send_timeout 300s; + proxy_read_timeout 300s; + send_timeout 300s; - # Buffering для больших тел запросов - proxy_request_buffering off; - proxy_buffering off; + # Buffering для больших тел запросов + proxy_request_buffering off; + proxy_buffering off; - location / { - proxy_pass http://{{ $.APP }}-{{ $upstream_port }}; - {{ if $.PROXY_PROTOCOL_PORT_MAP }} - proxy_set_header X-Forwarded-For $proxy_protocol_addr; - proxy_set_header X-Forwarded-Proto $proxy_protocol_scheme; - {{ else }} - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - {{ end }} - proxy_set_header X-Forwarded-Port $server_port; - proxy_set_header X-Request-Start $msec; - proxy_set_header Host $http_host; - proxy_http_version 1.1; - proxy_set_header Connection ""; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - } + location / { + proxy_pass http://{{ $.APP }}-{{ $upstream_port }}; + {{ if $.PROXY_PROTOCOL_PORT_MAP }} + proxy_set_header X-Forwarded-For $proxy_protocol_addr; + proxy_set_header X-Forwarded-Proto $proxy_protocol_scheme; + {{ else }} + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + {{ end }} + proxy_set_header X-Forwarded-Port $server_port; + proxy_set_header X-Request-Start $msec; + proxy_set_header Host $http_host; + proxy_http_version 1.1; + proxy_set_header Connection ""; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } - include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf; + include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf; - error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html; - location /400-error.html { - root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; - internal; - } + error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html; + location /400-error.html { + root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; + internal; + } - error_page 404 /404-error.html; - location /404-error.html { - root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; - internal; - } + error_page 404 /404-error.html; + location /404-error.html { + root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; + internal; + } - error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html; - location /500-error.html { - root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; - internal; - } -} -{{ else if eq $scheme "https"}} -server { - listen [::]:{{ $listen_port }} ssl {{ if eq $.HTTP2_SUPPORTED "true" }}http2{{ else if eq $.HTTP2_SUPPORTED "false"}}{{ else }}http2{{ end }}; - listen {{ $listen_port }} ssl {{ if eq $.HTTP2_SUPPORTED "true" }}http2{{ else if eq $.HTTP2_SUPPORTED "false"}}{{ else }}http2{{ end }}; - {{ if $.SSL_SERVER_NAME }}server_name {{ $.SSL_SERVER_NAME }}; {{ end }} - {{ if $.NOSSL_SERVER_NAME }}server_name {{ $.NOSSL_SERVER_NAME }}; {{ end }} - access_log /var/log/nginx/{{ $.APP }}-access.log; - error_log /var/log/nginx/{{ $.APP }}-error.log; + error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html; + location /500-error.html { + root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; + internal; + } + } + {{ else if eq $scheme "https"}} + server { + listen [::]:{{ $listen_port }} ssl {{ if eq $.HTTP2_SUPPORTED "true" }}http2{{ else if eq $.HTTP2_SUPPORTED "false"}}{{ else }}http2{{ end }}; + listen {{ $listen_port }} ssl {{ if eq $.HTTP2_SUPPORTED "true" }}http2{{ else if eq $.HTTP2_SUPPORTED "false"}}{{ else }}http2{{ end }}; + {{ if $.SSL_SERVER_NAME }}server_name {{ $.SSL_SERVER_NAME }}; {{ end }} + {{ if $.NOSSL_SERVER_NAME }}server_name {{ $.NOSSL_SERVER_NAME }}; {{ end }} + access_log /var/log/nginx/{{ $.APP }}-access.log; + error_log /var/log/nginx/{{ $.APP }}-error.log; - ssl_certificate {{ $.APP_SSL_PATH }}/server.crt; - ssl_certificate_key {{ $.APP_SSL_PATH }}/server.key; - ssl_protocols TLSv1.2 TLSv1.3; - ssl_prefer_server_ciphers off; + ssl_certificate {{ $.APP_SSL_PATH }}/server.crt; + ssl_certificate_key {{ $.APP_SSL_PATH }}/server.key; + ssl_protocols TLSv1.2 TLSv1.3; + ssl_prefer_server_ciphers off; - keepalive_timeout 70; + keepalive_timeout 70; - # Увеличенные лимиты для загрузки файлов - client_max_body_size 500M; - client_body_timeout 300s; - client_header_timeout 300s; - - # Увеличенные buffer размеры - client_body_buffer_size 1M; - client_header_buffer_size 4k; - large_client_header_buffers 8 8k; + # Увеличенные лимиты для загрузки файлов + client_max_body_size 500M; + client_body_timeout 300s; + client_header_timeout 300s; + + # Увеличенные buffer размеры + client_body_buffer_size 1M; + client_header_buffer_size 4k; + large_client_header_buffers 8 8k; - # Timeouts для больших файлов - proxy_connect_timeout 300s; - proxy_send_timeout 300s; - proxy_read_timeout 300s; - send_timeout 300s; + # Timeouts для больших файлов + proxy_connect_timeout 300s; + proxy_send_timeout 300s; + proxy_read_timeout 300s; + send_timeout 300s; - # Buffering для больших тел запросов - proxy_request_buffering off; - proxy_buffering off; + # Buffering для больших тел запросов + proxy_request_buffering off; + proxy_buffering off; - location / { - proxy_pass http://{{ $.APP }}-{{ $upstream_port }}; - {{ if $.PROXY_PROTOCOL_PORT_MAP }} - proxy_set_header X-Forwarded-For $proxy_protocol_addr; - proxy_set_header X-Forwarded-Proto $proxy_protocol_scheme; - {{ else }} - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - {{ end }} - proxy_set_header X-Forwarded-Port $server_port; - proxy_set_header X-Request-Start $msec; - proxy_set_header Host $http_host; - proxy_http_version 1.1; - proxy_set_header Connection ""; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - } + location / { + proxy_pass http://{{ $.APP }}-{{ $upstream_port }}; + {{ if $.PROXY_PROTOCOL_PORT_MAP }} + proxy_set_header X-Forwarded-For $proxy_protocol_addr; + proxy_set_header X-Forwarded-Proto $proxy_protocol_scheme; + {{ else }} + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + {{ end }} + proxy_set_header X-Forwarded-Port $server_port; + proxy_set_header X-Request-Start $msec; + proxy_set_header Host $http_host; + proxy_http_version 1.1; + proxy_set_header Connection ""; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } - include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf; + include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf; - error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html; - location /400-error.html { - root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; - internal; - } + error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html; + location /400-error.html { + root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; + internal; + } - error_page 404 /404-error.html; - location /404-error.html { - root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; - internal; - } + error_page 404 /404-error.html; + location /404-error.html { + root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; + internal; + } - error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html; - location /500-error.html { - root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; - internal; - } + error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html; + location /500-error.html { + root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; + internal; + } } {{ end }} + {{ end }} {{ if $.DOKKU_APP_WEB_LISTENERS }} -{{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }} -upstream {{ $.APP }}-{{ $upstream_port }} { -{{ range $listeners := $.DOKKU_APP_WEB_LISTENERS | split " " }} -{{ $listener_list := $listeners | split ":" }} -{{ $listener_ip := index $listener_list 0 }} -{{ $listener_port := index $listener_list 1 }} - server {{ $listener_ip }}:{{ $upstream_port }};{{ end }} -} -{{ end }}{{ end }} + {{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }} + upstream {{ $.APP }}-{{ $upstream_port }} { + {{ range $listeners := $.DOKKU_APP_WEB_LISTENERS | split " " }} + {{ $listener_list := $listeners | split ":" }} + {{ $listener_ip := index $listener_list 0 }} + {{ $listener_port := index $listener_list 1 }} + server {{ $listener_ip }}:{{ $upstream_port }}; + {{ end }} + } + {{ end }} + +{{ end }} diff --git a/src/s3_utils.rs b/src/s3_utils.rs index 9d4f159..3d5294d 100644 --- a/src/s3_utils.rs +++ b/src/s3_utils.rs @@ -73,14 +73,21 @@ pub async fn load_file_from_s3( /// Генерирует ключ с правильным расширением на основе MIME-типа. #[allow(clippy::collapsible_if)] pub fn generate_key_with_extension(base_key: String, mime_type: String) -> String { + // Убираем существующее расширение из base_key (если есть) + let key_without_ext = if let Some(dot_pos) = base_key.rfind('.') { + &base_key[..dot_pos] + } else { + &base_key + }; + let mime: mime::Mime = mime::Mime::from_str(&mime_type).unwrap_or(mime::APPLICATION_OCTET_STREAM); if let Some(extensions) = mime_guess::get_mime_extensions_str(mime.as_ref()) { if let Some(extension) = extensions.first() { - return format!("{}.{}", base_key, extension.to_lowercase()); + return format!("{}.{}", key_without_ext, extension.to_lowercase()); } } - base_key + key_without_ext.to_string() } /// список файлов из S3