diff --git a/app/config.py b/app/config.py index b324ae4..4569a96 100644 --- a/app/config.py +++ b/app/config.py @@ -1,5 +1,9 @@ DEPLOY_SCRIPT = "/tools/deploy-app.sh" -DELETE_APP_SCRIPT = "/tools/delete-app.sh" +# Mazání aplikace NEPROVÁDÍ portál přímo – běží bez práv k workspace, takže rm padá na +# "Permission denied". Portál jen zařadí run_script job a Worker spustí tento skript +# v appfactory-tools s právy serveru. Prefix "scripts/" je povinný, jinak ho worker hledá +# ve špatné složce (stejná konvence jako app/routes/runtime.py). +DELETE_APP_SCRIPT_NAME = "scripts/delete-app.sh" BACKUP_SCRIPT = "/tools/backup-appfactory.sh" RESTORE_SCRIPT = "/tools/restore-appfactory.sh" GENERATE_COMPOSE_SCRIPT = "/tools/generate-apps-compose.sh" diff --git a/app/routes/apps.py b/app/routes/apps.py index dfcc3b4..db968e8 100644 --- a/app/routes/apps.py +++ b/app/routes/apps.py @@ -8,7 +8,7 @@ from fastapi.responses import HTMLResponse, RedirectResponse from ..auth import is_admin, is_developer, require_admin, require_developer, require_user from ..config import ( DEFAULT_GITEA_ORG, - DELETE_APP_SCRIPT, + DELETE_APP_SCRIPT_NAME, DEPLOY_SCRIPT, GENERATE_COMPOSE_SCRIPT, get_appfactory_host, @@ -405,7 +405,7 @@ def apps_page( ) delete_icon = ( f""" -
+