Merge branch 'main' into chatbot

backend/.env.example

@@ -4,14 +4,14 @@ SECRET_KEY=change-me-to-32-bytes-random-secret
 ACCESS_TOKEN_EXPIRE_MINUTES=60
 REFRESH_TOKEN_EXPIRE_DAYS=14
 
-DATABASE_URL=postgresql+psycopg2://mikrocloud:mikrocloud@postgres:5432/mikrocloud
+DATABASE_URL=postgresql+psycopg2://ROSzetta:ROSzetta@postgres:5432/ROSzetta
 REDIS_URL=redis://redis:6379/0
 
 # MinIO / S3
 S3_ENDPOINT=http://minio:9000
 S3_ACCESS_KEY=minio
 S3_SECRET_KEY=minio12345
-S3_BUCKET=mikrocloud-backups
+S3_BUCKET=roszetta-backups
 
 # Bootstrap admin (создаётся при первом запуске)
 BOOTSTRAP_ADMIN_EMAIL=admin

backend/app/core/config.py

@@ -16,14 +16,14 @@ class Settings(BaseSettings):
     refresh_token_expire_days: int = 14
 
     database_url: str = (
-        "postgresql+psycopg2://mikrocloud:mikrocloud@postgres:5432/mikrocloud"
+        "postgresql+psycopg2://ROSzetta:ROSzetta@postgres:5432/ROSzetta"
     )
     redis_url: str = "redis://redis:6379/0"
 
     s3_endpoint: str = "http://minio:9000"
     s3_access_key: str = "minio"
     s3_secret_key: str = "minio12345"
-    s3_bucket: str = "mikrocloud-backups"
+    s3_bucket: str = "roszetta-backups"
 
     bootstrap_admin_email: str = "admin"
     bootstrap_admin_password: str = "admin"

deploy/.env.example

@@ -1,6 +1,6 @@
-POSTGRES_USER=mikrocloud
+POSTGRES_USER=ROSzetta
-POSTGRES_PASSWORD=mikrocloud
+POSTGRES_PASSWORD=ROSzetta
-POSTGRES_DB=mikrocloud
+POSTGRES_DB=ROSzetta
 
 MINIO_ROOT_USER=minio
 MINIO_ROOT_PASSWORD=minio12345

deploy/docker-compose.yml

@@ -1,13 +1,13 @@
-name: mikrocloud
+name: ROSzetta
 
 services:
   postgres:
     image: timescale/timescaledb:2.16.1-pg16
     restart: unless-stopped
     environment:
-      POSTGRES_USER: ${POSTGRES_USER:-mikrocloud}
+      POSTGRES_USER: ${POSTGRES_USER:-ROSzetta}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-mikrocloud}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-ROSzetta}
-      POSTGRES_DB: ${POSTGRES_DB:-mikrocloud}
+      POSTGRES_DB: ${POSTGRES_DB:-ROSzetta}
     volumes:
       - pg_data:/var/lib/postgresql/data
     ports:
@@ -49,12 +49,12 @@ services:
     environment:
       APP_ENV: dev
       SECRET_KEY: ${SECRET_KEY:-please-change-this-32-bytes-secret-now}
-      DATABASE_URL: postgresql+psycopg2://${POSTGRES_USER:-mikrocloud}:${POSTGRES_PASSWORD:-mikrocloud}@postgres:5432/${POSTGRES_DB:-mikrocloud}
+      DATABASE_URL: postgresql+psycopg2://${POSTGRES_USER:-ROSzetta}:${POSTGRES_PASSWORD:-ROSzetta}@postgres:5432/${POSTGRES_DB:-ROSzetta}
       REDIS_URL: redis://redis:6379/0
       S3_ENDPOINT: http://minio:9000
       S3_ACCESS_KEY: ${MINIO_ROOT_USER:-minio}
       S3_SECRET_KEY: ${MINIO_ROOT_PASSWORD:-minio12345}
-      S3_BUCKET: mikrocloud-backups
+      S3_BUCKET: roszetta-backups
       BOOTSTRAP_ADMIN_EMAIL: ${BOOTSTRAP_ADMIN_EMAIL:-admin}
       BOOTSTRAP_ADMIN_PASSWORD: ${BOOTSTRAP_ADMIN_PASSWORD:-admin}
       CORS_ORIGINS: "http://localhost:5173,http://127.0.0.1:5173"