diff --git a/README.md b/README.md
index 9d771617..8f027273 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,7 @@
- π **ΠΡΠΎΠΌΠΎ-ΡΠΈΡΡΠ΅ΠΌΠ°** - ΠΊΠΎΠ΄Ρ Π½Π° Π΄Π΅Π½ΡΠ³ΠΈ, Π΄Π½ΠΈ ΠΏΠΎΠ΄ΠΏΠΈΡΠΊΠΈ, ΡΡΠΈΠ°Π»-ΠΏΠ΅ΡΠΈΠΎΠ΄Ρ
- 3 ΡΠ΅ΠΆΠΈΠΌΠ° ΠΏΠΎΠΊΠ°Π·Π° ΡΡΡΠ»ΠΊΠΈ ΠΏΠΎΠ΄ΠΏΠΈΡΠΊΠΈ: 1) Π‘ Π³Π°ΠΉΠ΄ΠΎΠΌ ΠΏΠΎ ΠΏΠΎΠ΄ΠΊΠ»ΡΡΠ΅Π½ΠΈΡ ΠΏΡΡΠΌΠΎ Π² Π±ΠΎΡΠ΅(ΡΡΠ½ΡΡΠΈΠΉ Π΄Π°Π½Π½ΡΠ΅ ΠΏΡΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈΠΉ ΠΈ ΡΡΡΠ»ΠΎΠΊ Π½Π° ΡΠΊΠ°ΡΠΊΡ ΠΈΠ· app-config.json) 2) ΠΠ±ΡΡΠ½ΠΎΠ΅ ΠΎΡΠΊΡΡΡΠΈΠ΅ ΡΡΡΠ»ΠΊΠΈ ΠΏΠΎΠ΄ΠΏΠΈΡΠΊΠΈ Π² ΠΌΠΈΠ½ΠΈΠ°ΠΏΠ΅ 3) ΠΠ½ΡΠ΅Π³ΡΠ°ΡΠΈΡ ΡΠ°Π±ΠΏΠ΅ΠΉΠ΄ΠΆΠ° maposia - ΠΊΠ°ΡΡΠΎΠΌΠ½ΠΎ ΠΏΡΠΎΠΏΠΈΡΠ°ΡΡ ΡΡΡΠ»ΠΊΡ ΠΌΠΎΠΆΠ½ΠΎ
- ΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎΡΡΡ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠ°ΡΡΡΡ ΠΌΠ΅ΠΆΠ΄Ρ ΠΏΠ°ΠΊΠ΅ΡΠ½ΠΎΠΉ ΠΏΡΠΎΠ΄Π°ΠΆΠ΅ΠΉ ΡΡΠ°ΡΠΈΠΊΠ° ΠΈ ΡΠΈΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΠΎΠΉ(ΠΡΠΎΠΏΡΡΠΊΠ°Ρ ΡΠ°Π³ Π²ΡΠ±ΠΎΡΠ° ΠΏΠ°ΠΊΠ΅ΡΠ° ΡΡΠ°ΡΠΈΠΊΠ° ΠΏΡΠΈ ΠΎΡΠΎΡΠΌΠ»Π΅Π½ΠΈΠΈ/Π½Π°ΡΡΡΠΎΠΉΠΊΠΈ ΠΏΠΎΠ΄ΠΏΠΈΡΠΊΠΈ ΡΠ·Π΅ΡΠ°)
+- ΠΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎΡΡΡ Π·Π°Π΄Π°ΡΡ Π΄ΠΎΡΡΡΠΏΠ½ΡΠ΅ Π΄Π½ΠΈ Π΄Π»Ρ ΠΏΠΎΠΊΡΠΏΠΊΠΈ ΠΏΠ΅ΡΠ²ΠΎΠΉ ΠΏΠΎΠ΄ΠΏΠΈΡΠΊΠΈ ΠΈ ΠΏΡΠΈ ΠΏΡΠΎΠ΄Π»Π΅Π½ΠΈΠΈ
### πͺ **Enterprise Π³ΠΎΡΠΎΠ²Π½ΠΎΡΡΡ**
- ποΈ **Π‘ΠΎΠ²ΡΠ΅ΠΌΠ΅Π½Π½Π°Ρ Π°ΡΡ
ΠΈΡΠ΅ΠΊΡΡΡΠ°** - AsyncIO, PostgreSQL, Redis
@@ -428,7 +429,6 @@ bedolaga_bot/
```
project/
βββ docker-compose.yml # π ΠΡΠΎΠ΄Π°ΠΊΡΠ½
-βββ docker-compose.local.yml # π Π Π°Π·ΡΠ°Π±ΠΎΡΠΊΠ°
βββ .env # βοΈ ΠΠΎΠ½ΡΠΈΠ³
βββ .env.example # π ΠΡΠΈΠΌΠ΅Ρ
```
@@ -439,66 +439,45 @@ project/
π ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΠΎΠ»Π½ΡΠΉ docker-compose.yml
```yaml
-version: '3.8'
-
services:
- # ποΈ PostgreSQL Database
postgres:
image: postgres:15-alpine
- container_name: bedolaga_postgres
+ container_name: remnawave_bot_db
restart: unless-stopped
environment:
- POSTGRES_DB: ${POSTGRES_DB:-bedolaga_bot}
- POSTGRES_USER: ${POSTGRES_USER:-bedolaga_user}
+ POSTGRES_DB: ${POSTGRES_DB:-remnawave_bot}
+ POSTGRES_USER: ${POSTGRES_USER:-remnawave_user}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-secure_password_123}
- POSTGRES_INITDB_ARGS: "--encoding=UTF8 --lc-collate=C --lc-ctype=C"
+ POSTGRES_INITDB_ARGS: "--encoding=UTF8"
volumes:
- postgres_data:/var/lib/postgresql/data
- - ./init-scripts:/docker-entrypoint-initdb.d:ro
- ports:
- - "${POSTGRES_PORT:-5432}:5432"
networks:
- - bedolaga_network
+ - bot_network
healthcheck:
- test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-bedolaga_user} -d ${POSTGRES_DB:-bedolaga_bot}"]
- interval: 10s
+ test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-remnawave_user} -d ${POSTGRES_DB:-remnawave_bot}"]
+ interval: 30s
timeout: 5s
retries: 5
start_period: 30s
- logging:
- driver: "json-file"
- options:
- max-size: "10m"
- max-file: "3"
- # β‘ Redis Cache
redis:
image: redis:7-alpine
- container_name: bedolaga_redis
+ container_name: remnawave_bot_redis
restart: unless-stopped
- command: redis-server --appendonly yes --requirepass ${REDIS_PASSWORD:-redis_password_123}
+ command: redis-server --appendonly yes
volumes:
- redis_data:/data
- ports:
- - "${REDIS_PORT:-6379}:6379"
networks:
- - bedolaga_network
+ - bot_network
healthcheck:
- test: ["CMD", "redis-cli", "--no-auth-warning", "-a", "${REDIS_PASSWORD:-redis_password_123}", "ping"]
- interval: 10s
- timeout: 5s
+ test: ["CMD", "redis-cli", "ping"]
+ interval: 30s
+ timeout: 10s
retries: 3
- start_period: 10s
- logging:
- driver: "json-file"
- options:
- max-size: "5m"
- max-file: "3"
- # π€ Telegram Bot
bot:
image: fr1ngg/remnawave-bedolaga-telegram-bot:latest
- container_name: bedolaga_bot
+ container_name: remnawave_bot
restart: unless-stopped
depends_on:
postgres:
@@ -508,108 +487,35 @@ services:
env_file:
- .env
environment:
- DATABASE_URL: postgresql+asyncpg://${POSTGRES_USER:-bedolaga_user}:${POSTGRES_PASSWORD:-secure_password_123}@postgres:5432/${POSTGRES_DB:-bedolaga_bot}
- REDIS_URL: redis://:${REDIS_PASSWORD:-redis_password_123}@redis:6379/0
- LOG_LEVEL: ${LOG_LEVEL:-INFO}
- DEBUG: ${DEBUG:-false}
- HEALTH_CHECK_ENABLED: "true"
+ DATABASE_URL: postgresql+asyncpg://${POSTGRES_USER:-remnawave_user}:${POSTGRES_PASSWORD:-secure_password_123}@postgres:5432/${POSTGRES_DB:-remnawave_bot}
+ REDIS_URL: redis://redis:6379/0
volumes:
- ./logs:/app/logs
- ./data:/app/data
- - ./backups:/app/backups
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
ports:
- - "${WEBHOOK_PORT:-8081}:8081"
+ - "${TRIBUTE_WEBHOOK_PORT:-8081}:8081"
+ - "${YOOKASSA_WEBHOOK_PORT:-8082}:8082"
networks:
- - bedolaga_network
+ - bot_network
healthcheck:
- test: ["CMD", "python", "-c", "import requests; requests.get('http://localhost:8081/health', timeout=5)"]
+ test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8081/health"]
interval: 30s
timeout: 10s
retries: 3
start_period: 60s
- logging:
- driver: "json-file"
- options:
- max-size: "50m"
- max-file: "5"
- labels:
- - "traefik.enable=true"
- - "traefik.http.routers.bedolaga-webhook.rule=Host(`${WEBHOOK_DOMAIN:-localhost}`) && PathPrefix(`/tribute-webhook`)"
- - "traefik.http.services.bedolaga-webhook.loadbalancer.server.port=8081"
- # π Monitoring (ΠΎΠΏΡΠΈΠΎΠ½Π°Π»ΡΠ½ΠΎ)
- prometheus:
- image: prom/prometheus:latest
- container_name: bedolaga_prometheus
- restart: unless-stopped
- command:
- - '--config.file=/etc/prometheus/prometheus.yml'
- - '--storage.tsdb.path=/prometheus'
- - '--web.console.libraries=/etc/prometheus/console_libraries'
- - '--web.console.templates=/etc/prometheus/consoles'
- - '--storage.tsdb.retention.time=200h'
- - '--web.enable-lifecycle'
- volumes:
- - ./monitoring/prometheus.yml:/etc/prometheus/prometheus.yml
- - prometheus_data:/prometheus
- ports:
- - "9090:9090"
- networks:
- - bedolaga_network
- profiles:
- - monitoring
-
- # π Grafana (ΠΎΠΏΡΠΈΠΎΠ½Π°Π»ΡΠ½ΠΎ)
- grafana:
- image: grafana/grafana:latest
- container_name: bedolaga_grafana
- restart: unless-stopped
- environment:
- GF_SECURITY_ADMIN_USER: ${GRAFANA_USER:-admin}
- GF_SECURITY_ADMIN_PASSWORD: ${GRAFANA_PASSWORD:-admin123}
- volumes:
- - grafana_data:/var/lib/grafana
- - ./monitoring/grafana/dashboards:/etc/grafana/provisioning/dashboards
- - ./monitoring/grafana/datasources:/etc/grafana/provisioning/datasources
- ports:
- - "3000:3000"
- networks:
- - bedolaga_network
- profiles:
- - monitoring
-
-# π¦ Volumes
volumes:
postgres_data:
- driver: local
- driver_opts:
- type: none
- o: bind
- device: ./volumes/postgres
redis_data:
- driver: local
- driver_opts:
- type: none
- o: bind
- device: ./volumes/redis
- prometheus_data:
- driver: local
- grafana_data:
- driver: local
-# π Networks
networks:
- bedolaga_network:
+ bot_network:
driver: bridge
ipam:
- driver: default
config:
- subnet: 172.20.0.0/16
- gateway: 172.20.0.1
- driver_opts:
- com.docker.network.bridge.name: br-bedolaga
```
@@ -620,8 +526,6 @@ networks:
π ΠΠΎΠΊΠ°Π·Π°ΡΡ dev ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΡ
```yaml
-version: '3.8'
-
services:
# ποΈ PostgreSQL Π΄Π»Ρ ΡΠ°Π·ΡΠ°Π±ΠΎΡΠΊΠΈ
postgres-dev: