From ba348eb6392902f88b5f02046efaacece0a584b1 Mon Sep 17 00:00:00 2001 From: machka Date: Wed, 21 May 2025 12:23:11 +0000 Subject: [PATCH] Logger and docker-compose.yml update --- bot/main_bot.py | 9 +-------- docker-compose.yml | 3 ++- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/bot/main_bot.py b/bot/main_bot.py index 99708bb..10538c0 100644 --- a/bot/main_bot.py +++ b/bot/main_bot.py @@ -105,14 +105,7 @@ async def on_startup_configured(dispatcher: Dispatcher): telegram_webhook_url_to_set = getattr(settings, 'TELEGRAM_WEBHOOK_BASE_URL', None) if telegram_webhook_url_to_set: - if settings.BOT_TOKEN in telegram_webhook_url_to_set: - logging.error( - f"CRITICAL SECURITY RISK: Bot token detected in TELEGRAM_WEBHOOK_BASE_URL ('{telegram_webhook_url_to_set}'). " - "This is a major security vulnerability. Webhook will NOT be set." - ) - full_telegram_webhook_url = "ERROR_URL_TOKEN_DETECTED" - else: - full_telegram_webhook_url = f"{str(telegram_webhook_url_to_set).rstrip('/')}/{settings.BOT_TOKEN}" + full_telegram_webhook_url = f"{str(telegram_webhook_url_to_set).rstrip('/')}/{settings.BOT_TOKEN}" logging.info( f"STARTUP: Attempting to set Telegram webhook to: {full_telegram_webhook_url if full_telegram_webhook_url != 'ERROR_URL_TOKEN_DETECTED' else 'HIDDEN DUE TO TOKEN'}" diff --git a/docker-compose.yml b/docker-compose.yml index 5d0d39c..4282534 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,9 +12,10 @@ services: - ./locales:/app/locales restart: unless-stopped - postgres: + remnawave-tg-shop-db: image: postgres:17 container_name: remnawave-tg-shop-db + hostname: remnawave-tg-shop-db env_file: - .env volumes: