From 752522cc1319d89166ce6322116d9252648e72c0 Mon Sep 17 00:00:00 2001 From: RGalyaviev Date: Wed, 3 Sep 2025 15:50:57 +0300 Subject: [PATCH] Fix startup: correct watermark HTML concatenation; allow DATABASE env var; compose persists DB under /data; minor header css retains single Exit button --- app.py | 18 +++++++++++------- docker-compose.yml | 4 ++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app.py b/app.py index fade6ce..0066b80 100644 --- a/app.py +++ b/app.py @@ -26,7 +26,10 @@ def create_app(): # For production, override via env var. This default is for local/dev only. "dev-secret-change-me", ) - app.config["DATABASE"] = os.path.join(os.path.dirname(__file__), "app.db") + app.config["DATABASE"] = os.environ.get( + "DATABASE", + os.path.join(os.path.dirname(__file__), "app.db"), + ) # Admin credentials (can be overridden via env) app.config["ADMIN_USERNAME"] = os.environ.get("ADMIN_USERNAME", "ruslan") @@ -223,13 +226,14 @@ def create_app(): html = html + toolbar # Ensure watermark exists on published pages (top-left) wm = ( - '' - '' - '' - '
" + "" + "" + "
' - 'Made by Ruslan'
' + "text-shadow:0 2px 8px rgba(0,0,0,.35);pointer-events:none;user-select:none;\">" + "Made by Ruslan" + "
" ) lower_all = html.lower() if "" in lower_all: diff --git a/docker-compose.yml b/docker-compose.yml index 754de30..6ed1e03 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,10 +10,10 @@ services: - SECRET_KEY=${SECRET_KEY:-prod-secret} - ADMIN_USERNAME=${ADMIN_USERNAME:-ruslan} - ADMIN_PASSWORD=${ADMIN_PASSWORD:-utOgbZ09ruslan} + - DATABASE=/data/app.db volumes: - - appdb:/app/app.db + - appdb:/data restart: unless-stopped volumes: appdb: {} -