From f3579549b41cd1eb485ff7cad79105bd9e6c0b23 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Sat, 24 Oct 2026 11:11:27 +0200 Subject: [PATCH] create-deploy-user.py: Username deploy__ (max. 32 Zeichen) --- create-deploy-user.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/create-deploy-user.py b/create-deploy-user.py index 50d0004..343a32e 100755 --- a/create-deploy-user.py +++ b/create-deploy-user.py @@ -137,7 +137,7 @@ def parse_args() -> argparse.Namespace: p.add_argument("--server", default=DEFAULT_SERVER, help=f"Zielserver; bestimmt server__ssh_access und server__docker_compose (Standard: {DEFAULT_SERVER})") p.add_argument("--project-path", help="Gitea-Repository: 'owner/repo' oder URL") - p.add_argument("--username", help="Username des Deploy-Users (Standard: deploy__)") + p.add_argument("--username", help="Username des Deploy-Users (Standard: deploy__, max. 32 Zeichen)") p.add_argument("--docker-group", help="Gruppe für Docker-Deploys (Standard: server__docker_compose)") p.add_argument("--no-docker-group", action="store_true", help="Docker-Deploy-Gruppe nicht zuweisen") @@ -152,9 +152,10 @@ def parse_args() -> argparse.Namespace: return p.parse_args() -def make_username(repo_path: str) -> str: - name = "deploy_" + re.sub(r"[^a-z0-9]+", "_", repo_path.lower()).strip("_") - return name[:32].rstrip("_") +def make_username(repo_id: int, repo_name: str) -> str: + """deploy__; die ID bleibt immer erhalten, der Name wird auf 32 Zeichen gekürzt.""" + slug = re.sub(r"[^a-z0-9]+", "_", repo_name.lower()).strip("_") + return f"deploy_{repo_id}_{slug}"[:32].rstrip("_") def load_env_file(path: Path) -> None: @@ -189,7 +190,7 @@ def main() -> int: repo = gitea.get_repo(repo_path) repo_path = repo["full_name"] # kanonische Schreibweise - username = args.username or make_username(repo_path) + username = args.username or make_username(repo["id"], repo["name"]) if not USERNAME_RE.match(username): sys.exit(f"Ungültiger Username '{username}' (erlaubt: ^[a-z_][a-z0-9_-]{{0,31}}$)") home_dir = f"{HOME_DIR_BASE}/{username}"