chore: update

This commit is contained in:
Nuxgrid
2026-07-12 16:22:39 +02:00
parent f9c821f14f
commit 7dbd319726
3 changed files with 14 additions and 30 deletions
+2
View File
@@ -13,3 +13,5 @@ frontend-prep/
mobile/node_modules/* mobile/node_modules/*
mobile mobile
.ssh .ssh
backend/
mc_utilisation
+7 -10
View File
@@ -5,15 +5,14 @@ services:
restart: unless-stopped restart: unless-stopped
ports: ports:
- "80:80" - "80:80"
- "443:443" - "9000:9000"
- "9001:9001"
volumes: volumes:
- ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
- ./nginx/certs:/etc/nginx/certs:ro - ./nginx/certs:/etc/nginx/certs:ro
- nginx_logs:/var/log/nginx - nginx_logs:/var/log/nginx
depends_on: depends_on:
- rustfs - rustfs
- xavia
- gitea
networks: networks:
- s3_net - s3_net
@@ -21,8 +20,9 @@ services:
image: alpine:latest image: alpine:latest
container_name: rustfs_perm container_name: rustfs_perm
volumes: volumes:
- /mnt/logs:/logs
- /mnt/data:/data - /mnt/data:/data
command: chown -R 10001:10001 /data command: sh -c "chown -R 10001:10001 /data /logs"
rustfs: rustfs:
image: rustfs/rustfs:latest image: rustfs/rustfs:latest
@@ -38,10 +38,10 @@ services:
environment: environment:
- RUSTFS_ACCESS_KEY=${RUSTFS_ACCESS_KEY:-JJg3uFeuKUUrdqq4oefQ8sIp6hnI} - RUSTFS_ACCESS_KEY=${RUSTFS_ACCESS_KEY:-JJg3uFeuKUUrdqq4oefQ8sIp6hnI}
- RUSTFS_SECRET_KEY=${RUSTFS_SECRET_KEY:-7wPrOd1324t411q7VnuzfNkQXCch4U5qqOHx} - RUSTFS_SECRET_KEY=${RUSTFS_SECRET_KEY:-7wPrOd1324t411q7VnuzfNkQXCch4U5qqOHx}
- RUSTFS_SERVER_DOMAINS=rustfs.uber-stup.club
- RUSTFS_CONSOLE_ENABLE=true - RUSTFS_CONSOLE_ENABLE=true
- RUSTFS_ADDRESS=:9000 - RUSTFS_ADDRESS=0.0.0.0:9000
- RUSTFS_CONSOLE_ADDRESS=:9001 - RUSTFS_CONSOLE_ADDRESS=0.0.0.0:9001
- RUSTFS_OBS_LOGGER_LEVEL=debug
networks: networks:
- s3_net - s3_net
@@ -60,6 +60,3 @@ networks:
volumes: volumes:
nginx_logs: nginx_logs:
xavia_db_data:
xavia_blobs:
gitea:
+5 -20
View File
@@ -1,30 +1,21 @@
worker_processes auto; worker_processes auto;
events { events {
worker_connections 1024; worker_connections 1024;
} }
http { http {
resolver 127.0.0.11 valid=10s ipv6=off; resolver 127.0.0.11 valid=10s ipv6=off;
server { server {
listen 80; listen 80;
server_name _; server_name _;
return 301 https://$host$request_uri; return 301 http://$host:9001$request_uri;
} }
# ── RustFS Console ────────────────────────────────────── # ── RustFS Console ──────────────────────────────────────
server { server {
listen 8443 ssl; listen 9001;
server_name _; 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; access_log /var/log/nginx/rustfs_access.log;
error_log /var/log/nginx/rustfs_error.log; error_log /var/log/nginx/rustfs_error.log;
location / { location / {
set $upstream http://rustfs:9001; set $upstream http://rustfs:9001;
proxy_pass $upstream; proxy_pass $upstream;
@@ -42,17 +33,10 @@ http {
# ── RustFS S3 API ─────────────────────────────────────── # ── RustFS S3 API ───────────────────────────────────────
server { server {
listen 9443 ssl; listen 9000;
server_name _; 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; access_log /var/log/nginx/rustfs_s3_access.log;
error_log /var/log/nginx/rustfs_s3_error.log; error_log /var/log/nginx/rustfs_s3_error.log;
location / { location / {
set $upstream http://rustfs:9000; set $upstream http://rustfs:9000;
proxy_pass $upstream; proxy_pass $upstream;
@@ -60,6 +44,7 @@ http {
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_cache_convert_head off;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_read_timeout 300s; proxy_read_timeout 300s;
client_max_body_size 2g; client_max_body_size 2g;