ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
fix(2): load .env file in CLI before app initialization
Juan Denis4ba0afee9702
diff --git a/backend/cli.py b/backend/cli.pyindex 8a819a95..e9cc58de 100644--- a/backend/cli.py+++ b/backend/cli.py@@ -1,19 +1,58 @@#!/usr/bin/env python3"""ServerKit CLI - Administrative commands for ServerKit."""+import osimport clickimport secretsimport sys-from werkzeug.security import generate_password_hash+from pathlib import Path++# Load .env file before importing app+# Check multiple locations for the .env file+def load_env():+ """Load environment variables from .env file."""+ try:+ from dotenv import load_dotenv++ # Try multiple locations+ env_locations = [+ Path(__file__).parent / '.env', # Same directory as cli.py+ Path(__file__).parent.parent / '.env', # Parent directory+ Path('/opt/serverkit/.env'), # Production location+ Path('/opt/serverkit/backend/.env'), # Alternative production+ ]++ for env_path in env_locations:+ if env_path.exists():+ load_dotenv(env_path)+ return str(env_path)++ # Also check if DATABASE_URL is already set+ if os.environ.get('DATABASE_URL'):+ return 'environment'++ return None+ except ImportError:+ # python-dotenv not installed+ return None++# Load env before any other imports that might use config+_env_loaded = load_env()+from werkzeug.security import generate_password_hashfrom app import create_app, dbfrom app.models import User@click.group()-def cli():[email protected]('--debug', is_flag=True, help='Show debug information')[email protected]_context+def cli(ctx, debug):"""ServerKit administrative CLI."""- pass+ ctx.ensure_object(dict)+ ctx.obj['debug'] = debug+ if debug and _env_loaded:+ click.echo(f"Loaded environment from: {_env_loaded}")@cli.command()