diff --git a/.env b/.env.example similarity index 92% rename from .env rename to .env.example index 89cd809..2157a6d 100644 --- a/.env +++ b/.env.example @@ -35,4 +35,7 @@ PROJECT_BASE=/flarum MYSQL_ROOT_PASSWORD=123456 MYSQL_DATABASE=flarum MYSQL_USER=admin -MYSQL_PASSWORD=123456 \ No newline at end of file +MYSQL_PASSWORD=123456 + +MINIO_ROOT_USER=admin +MINIO_ROOT_PASSWORD=123456 \ No newline at end of file diff --git a/compose/traefik/traefik.yml b/compose/traefik/traefik.yml index 7fa6e64..24c15a4 100644 --- a/compose/traefik/traefik.yml +++ b/compose/traefik/traefik.yml @@ -111,7 +111,7 @@ http: certResolver: letsencrypt privatebin-router: - rule: "Host(`bin.furyhawk.lol`)" + rule: "Host(`bin.furyhawk.lol`, `paste.furyhawk.lol`)" entryPoints: - web-secure middlewares: @@ -121,7 +121,7 @@ http: certResolver: letsencrypt heynote-router: - rule: "Host(`note.furyhawk.lol`)" + rule: "Host(`note.furyhawk.lol`, `pad.furyhawk.lol`)" entryPoints: - web-secure middlewares: @@ -151,7 +151,7 @@ http: certResolver: letsencrypt chat-router: - rule: "Host(`chat.furyhawk.lol`)" + rule: "Host(`bot.furyhawk.lol`, `chat.furyhawk.lol`)" entryPoints: - web-secure middlewares: @@ -160,6 +160,16 @@ http: tls: certResolver: letsencrypt + minio-router: + rule: "Host(`drive.furyhawk.lol`, `minio.furyhawk.lol`, `s3.furyhawk.lol`, `storage.furyhawk.lol`)" + entryPoints: + - web-secure + middlewares: + - csrf + service: minio_server + tls: + certResolver: letsencrypt + mqtt-router: rule: "Host(`mqtt.furyhawk.lol`)" entryPoints: @@ -335,6 +345,10 @@ http: loadBalancer: servers: - url: http://LibreChat:3080 + minio_server: + loadBalancer: + servers: + - url: http://minio_server:9001 emqx-web-socket: loadBalancer: servers: diff --git a/production.yml b/production.yml index 82500e1..b36ad3d 100644 --- a/production.yml +++ b/production.yml @@ -143,6 +143,30 @@ services: - net - default + minio-common: + image: quay.io/minio/minio:RELEASE.2024-04-18T19-09-19Z + container_name: minio_server + environment: + MINIO_ROOT_USER: "${MINIO_ROOT_USER:-minioadmin}" + MINIO_ROOT_PASSWORD: "${MINIO_ROOT_PASSWORD:-minioadmin}" + # MINIO_OPTS: "--console-address :9001" + # MINIO_SERVER_URL: https://drive.furyhawk.lol + user: "1000:1000" + restart: unless-stopped + expose: + - 9000 + - 9001 + healthcheck: + test: ["CMD", "mc", "ready", "local"] + interval: 5s + timeout: 5s + retries: 5 + networks: + - net + - default + volumes: + - "./minio-data:/data" + streamlit-bai: environment: <<: *default-environment