sascha/homelab-butler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: sichere Tuning-Synchronisation bei lokaler Ansible-Abweichung #16

Merged
sascha merged 2 commits from fix/ansible-tuning-sync-with-local-divergence into main 2026-08-08 22:49:37 +02:00
Conversation 0 Commits 2 Files changed 2 +24 -6
1 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f1f855c596 - Show all commits

30
app.py
View file

@ -11,7 +11,7 @@ from fastapi.responses import JSONResponse, RedirectResponse
from contextlib import asynccontextmanager from contextlib import asynccontextmanager
log = logging.getLogger("butler") log = logging.getLogger("butler")
VERSION = "2.3.4" VERSION = "2.3.5"
API_DIR = os.environ.get("API_KEY_DIR", "/data/api") API_DIR = os.environ.get("API_KEY_DIR", "/data/api")
VAULT_CACHE_DIR = os.environ.get("VAULT_CACHE_DIR", "/data/vault-cache") VAULT_CACHE_DIR = os.environ.get("VAULT_CACHE_DIR", "/data/vault-cache")
@ -1574,11 +1574,29 @@ async def ansible_run(request: Request, _=Depends(_verify)):
return JSONResponse({"error": "action must be setup, tune or pvetune"}, status_code=400) return JSONResponse({"error": "action must be setup, tune or pvetune"}, status_code=400)
if not re.fullmatch(r"[a-zA-Z0-9_.:-]+", hostname): if not re.fullmatch(r"[a-zA-Z0-9_.:-]+", hostname):
return JSONResponse({"error": "invalid hostname/limit"}, status_code=400) return JSONResponse({"error": "invalid hostname/limit"}, status_code=400)
command = ( if action in {"tune", "pvetune"}:
"cd /app-config/ansible && " approved_files = (
"git pull --ff-only origin master && " "roles/sysctl/defaults/main.yml",
f"bash pfannkuchen.sh {action} {hostname}" "roles/sysctl/tasks/main.yml",
) "group_vars/vps/sysctl.yml",
"sysctl-proxmox.yaml",
"roles/sysctl_proxmox/tasks/main.yml",
)
file_sync = " && ".join(
f"git show origin/master:{path} > {path}" for path in approved_files
)
command = (
"cd /app-config/ansible && "
"git fetch origin master && "
f"{file_sync} && "
f"bash pfannkuchen.sh {action} {hostname}"
)
else:
command = (
"cd /app-config/ansible && "
"git pull --ff-only origin master && "
f"bash pfannkuchen.sh {action} {hostname}"
)
rc, out, err = _ssh(AUTOMATION1, command, timeout=600) rc, out, err = _ssh(AUTOMATION1, command, timeout=600)
_audit("/ansible/run", "POST", 200 if rc == 0 else 502, f"{action} {hostname}") _audit("/ansible/run", "POST", 200 if rc == 0 else 502, f"{action} {hostname}")
if action != "setup": if action != "setup":