From 7dbd319726f1749abe438ebfb355e1fc43404ce7 Mon Sep 17 00:00:00 2001 From: Nuxgrid Date: Sun, 12 Jul 2026 16:22:39 +0200 Subject: [PATCH] chore: update --- .gitignore | 2 ++ monitoring/s3-img/docker-compose.yml | 17 +++++++---------- monitoring/s3-img/nginx/nginx.conf | 25 +++++-------------------- 3 files changed, 14 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 8126b0ce..a8a48ea5 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ frontend-prep/ mobile/node_modules/* mobile .ssh +backend/ +mc_utilisation diff --git a/monitoring/s3-img/docker-compose.yml b/monitoring/s3-img/docker-compose.yml index 64564dfd..505490aa 100644 --- a/monitoring/s3-img/docker-compose.yml +++ b/monitoring/s3-img/docker-compose.yml @@ -5,15 +5,14 @@ services: restart: unless-stopped ports: - "80:80" - - "443:443" + - "9000:9000" + - "9001:9001" volumes: - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro - ./nginx/certs:/etc/nginx/certs:ro - nginx_logs:/var/log/nginx depends_on: - rustfs - - xavia - - gitea networks: - s3_net @@ -21,8 +20,9 @@ services: image: alpine:latest container_name: rustfs_perm volumes: + - /mnt/logs:/logs - /mnt/data:/data - command: chown -R 10001:10001 /data + command: sh -c "chown -R 10001:10001 /data /logs" rustfs: image: rustfs/rustfs:latest @@ -38,10 +38,10 @@ services: environment: - RUSTFS_ACCESS_KEY=${RUSTFS_ACCESS_KEY:-JJg3uFeuKUUrdqq4oefQ8sIp6hnI} - RUSTFS_SECRET_KEY=${RUSTFS_SECRET_KEY:-7wPrOd1324t411q7VnuzfNkQXCch4U5qqOHx} - - RUSTFS_SERVER_DOMAINS=rustfs.uber-stup.club - RUSTFS_CONSOLE_ENABLE=true - - RUSTFS_ADDRESS=:9000 - - RUSTFS_CONSOLE_ADDRESS=:9001 + - RUSTFS_ADDRESS=0.0.0.0:9000 + - RUSTFS_CONSOLE_ADDRESS=0.0.0.0:9001 + - RUSTFS_OBS_LOGGER_LEVEL=debug networks: - s3_net @@ -60,6 +60,3 @@ networks: volumes: nginx_logs: - xavia_db_data: - xavia_blobs: - gitea: diff --git a/monitoring/s3-img/nginx/nginx.conf b/monitoring/s3-img/nginx/nginx.conf index fe5cb525..f16152cd 100644 --- a/monitoring/s3-img/nginx/nginx.conf +++ b/monitoring/s3-img/nginx/nginx.conf @@ -1,30 +1,21 @@ worker_processes auto; - events { worker_connections 1024; } - http { resolver 127.0.0.11 valid=10s ipv6=off; + server { listen 80; server_name _; - return 301 https://$host$request_uri; + return 301 http://$host:9001$request_uri; } - # ── RustFS Console ────────────────────────────────────── server { - listen 8443 ssl; + listen 9001; server_name _; - - ssl_certificate /etc/nginx/certs/fullchain.pem; - ssl_certificate_key /etc/nginx/certs/privkey.pem; - ssl_protocols TLSv1.2 TLSv1.3; - ssl_ciphers HIGH:!aNULL:!MD5; - access_log /var/log/nginx/rustfs_access.log; error_log /var/log/nginx/rustfs_error.log; - location / { set $upstream http://rustfs:9001; proxy_pass $upstream; @@ -42,17 +33,10 @@ http { # ── RustFS S3 API ─────────────────────────────────────── server { - listen 9443 ssl; + listen 9000; server_name _; - - ssl_certificate /etc/nginx/certs/fullchain.pem; - ssl_certificate_key /etc/nginx/certs/privkey.pem; - ssl_protocols TLSv1.2 TLSv1.3; - ssl_ciphers HIGH:!aNULL:!MD5; - access_log /var/log/nginx/rustfs_s3_access.log; error_log /var/log/nginx/rustfs_s3_error.log; - location / { set $upstream http://rustfs:9000; proxy_pass $upstream; @@ -60,6 +44,7 @@ http { 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_cache_convert_head off; proxy_set_header X-Forwarded-Proto $scheme; proxy_read_timeout 300s; client_max_body_size 2g;