yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clanInternals.machines: invert system and machine name

Browse Source
This commit is contained in:
Jörg Thalheim
2023-09-27 17:25:17 +02:00
parent 59f0a912ea
commit 756820e4ca
4 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/clan-cli/clan_cli/secrets/generate.py
View File

@@ -19,7 +19,7 @@ def generate_secrets(machine: str) -> None:
cmd = nix_build(
[
f'path:{clan_dir}#clanInternals.machines."{machine}".{system}.config.system.clan.generateSecrets'
f'path:{clan_dir}#clanInternals.machines."{system}"."{machine}".generateSecrets'
]
)
proc = subprocess.run(cmd, stdout=subprocess.PIPE, text=True)

6
pkgs/clan-cli/clan_cli/secrets/upload.py
View File

@@ -15,9 +15,7 @@ def upload_secrets(machine: str) -> None:
proc = subprocess.run(
nix_build(
[
f'{clan_dir}#clanInternals.machines."{machine}".{system}.config.system.clan.uploadSecrets'
]
[f'{clan_dir}#clanInternals.machines."{system}"."{machine}".uploadSecrets']
),
stdout=subprocess.PIPE,
text=True,
@@ -30,7 +28,7 @@ def upload_secrets(machine: str) -> None:
subprocess.run(
nix_eval(
[
f'{clan_dir}#clanInternals.machines."{machine}".{system}.config.clan.networking.deploymentAddress'
f'{clan_dir}#clanInternals.machines."{system}"."{machine}".deploymentAddress'
]
),
stdout=subprocess.PIPE,