From efa0546da55d2eea59958feb6439bc8cba41c6c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 8 Aug 2023 17:24:40 +0200 Subject: [PATCH] sops: make symlinks relative --- pkgs/clan-cli/clan_cli/secrets/groups.py | 2 +- pkgs/clan-cli/clan_cli/secrets/secrets.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/secrets/groups.py b/pkgs/clan-cli/clan_cli/secrets/groups.py index c94866eb..1deeb46f 100644 --- a/pkgs/clan-cli/clan_cli/secrets/groups.py +++ b/pkgs/clan-cli/clan_cli/secrets/groups.py @@ -60,7 +60,7 @@ def add_member(group_folder: Path, source_folder: Path, name: str) -> None: f"Cannot add user {name}. {user_target} exists but is not a symlink" ) os.remove(user_target) - user_target.symlink_to(source) + user_target.symlink_to(os.path.relpath(source, user_target.parent)) def remove_member(group_folder: Path, name: str) -> None: diff --git a/pkgs/clan-cli/clan_cli/secrets/secrets.py b/pkgs/clan-cli/clan_cli/secrets/secrets.py index 7a821a5d..319b92e6 100644 --- a/pkgs/clan-cli/clan_cli/secrets/secrets.py +++ b/pkgs/clan-cli/clan_cli/secrets/secrets.py @@ -123,7 +123,8 @@ def allow_member(group_folder: Path, source_folder: Path, name: str) -> None: f"Cannot add user {name}. {user_target} exists but is not a symlink" ) os.remove(user_target) - user_target.symlink_to(source) + + user_target.symlink_to(os.path.relpath(source, user_target.parent)) update_keys(group_folder.parent, collect_keys_for_path(group_folder.parent))