diff --git a/.env b/.env deleted file mode 100644 index df11af2..0000000 --- a/.env +++ /dev/null @@ -1,5 +0,0 @@ -# Docker Compose Project Name -COMPOSE_PROJECT_NAME=lichess - -# Примечание: Другие переменные окружения хранятся в конфигах сервисов -# Telegram Bot Token: LichessClientTG_bot/config.py diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..048aca9 --- /dev/null +++ b/.env.example @@ -0,0 +1,6 @@ +# Docker Compose Project Name +COMPOSE_PROJECT_NAME=lichess + +# Telegram Bot Tokens (Test) +TELEGRAM_BOT_TOKEN=7903295042:AAGBO2k8pfBDy4RoLRFsknwE7z0N-thAPI8 +ADMINPANEL_TELEGRAM_BOT_TOKEN=8588876086:AAHoZncfhTCbul1BblpvnZMzvz7jAYVFmcw diff --git a/.gitignore b/.gitignore index a6027b4..6cb6333 100644 --- a/.gitignore +++ b/.gitignore @@ -40,7 +40,7 @@ logs/ .dockerignore # Environment -# .env - НЕ в ignore, чтобы параметры проекта были в репозитории +.env .env.local .env.backup diff --git a/LichessClientTG_bot/config.py b/LichessClientTG_bot/config.py index a8b46d6..b58ed54 100644 --- a/LichessClientTG_bot/config.py +++ b/LichessClientTG_bot/config.py @@ -3,25 +3,8 @@ from dotenv import load_dotenv load_dotenv() -IS_PROD = True - -# Telegram Bot Configuration (Production) -TELEGRAM_BOT_TOKEN_PROD = "8241474807:AAH684LTY93aXRou4-LtqU5-p8LuEjzYn8U" -# Admin Panel Bot Configuration (Production) -ADMINPANEL_TELEGRAM_BOT_TOKEN_PROD = "7918349610:AAEZH7lbzdams31rCDZXeaAzFluDWfUQoLg" - -# Telegram Bot Configuration (Test) -TELEGRAM_BOT_TOKEN_TEST = "7903295042:AAGBO2k8pfBDy4RoLRFsknwE7z0N-thAPI8" -# Admin Panel Bot Configuration (Test) -ADMINPANEL_TELEGRAM_BOT_TOKEN_TEST = "8588876086:AAHoZncfhTCbul1BblpvnZMzvz7jAYVFmcw" - -# Select tokens based on IS_PROD flag -if IS_PROD: - TELEGRAM_BOT_TOKEN = TELEGRAM_BOT_TOKEN_PROD - ADMINPANEL_TELEGRAM_BOT_TOKEN = ADMINPANEL_TELEGRAM_BOT_TOKEN_PROD -else: - TELEGRAM_BOT_TOKEN = TELEGRAM_BOT_TOKEN_TEST - ADMINPANEL_TELEGRAM_BOT_TOKEN = ADMINPANEL_TELEGRAM_BOT_TOKEN_TEST +TELEGRAM_BOT_TOKEN = os.getenv("TELEGRAM_BOT_TOKEN") +ADMINPANEL_TELEGRAM_BOT_TOKEN = os.getenv("ADMINPANEL_TELEGRAM_BOT_TOKEN") # Lichess API Configuration diff --git a/docker-compose.yml b/docker-compose.yml index dac9f95..c405a41 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,6 +24,8 @@ services: volumes: - ./LichessClientTG_bot/data:/app/data - ./LichessClientTG_bot:/app + env_file: + - .env environment: - PYTHONPATH=/app - PYTHONUNBUFFERED=1 @@ -47,6 +49,8 @@ services: volumes: - ./LichessClientTG_bot/data:/app/data - ./LichessClientTG_bot:/app + env_file: + - .env environment: - PYTHONPATH=/app - PYTHONUNBUFFERED=1