clan secrets generate: use get_clan_flake_toplevel
This commit is contained in:
parent
5285423479
commit
798e85ee8a
@ -4,8 +4,11 @@ import sys
|
|||||||
|
|
||||||
from clan_cli.errors import ClanError
|
from clan_cli.errors import ClanError
|
||||||
|
|
||||||
|
from ..dirs import get_clan_flake_toplevel
|
||||||
|
|
||||||
def get_secret_script(machine: str) -> None:
|
|
||||||
|
def generate_secrets(machine: str) -> None:
|
||||||
|
clan_flake = get_clan_flake_toplevel()
|
||||||
proc = subprocess.run(
|
proc = subprocess.run(
|
||||||
[
|
[
|
||||||
"nix",
|
"nix",
|
||||||
@ -13,12 +16,13 @@ def get_secret_script(machine: str) -> None:
|
|||||||
"--impure",
|
"--impure",
|
||||||
"--print-out-paths",
|
"--print-out-paths",
|
||||||
"--expr",
|
"--expr",
|
||||||
"let f = builtins.getFlake (toString ./.); in "
|
f'let f = builtins.getFlake "{clan_flake}"; in '
|
||||||
f"(f.nixosConfigurations.{machine}.extendModules "
|
"(f.nixosConfigurations."
|
||||||
"{ modules = [{ clanCore.clanDir = toString ./.; }]; })"
|
f"{machine}"
|
||||||
".config.system.clan.generateSecrets",
|
".extendModules { modules = [{ clanCore.clanDir = "
|
||||||
|
f"{clan_flake}"
|
||||||
|
"; }]; }).config.system.clan.generateSecrets",
|
||||||
],
|
],
|
||||||
check=True,
|
|
||||||
capture_output=True,
|
capture_output=True,
|
||||||
text=True,
|
text=True,
|
||||||
)
|
)
|
||||||
@ -30,7 +34,6 @@ def get_secret_script(machine: str) -> None:
|
|||||||
print(secret_generator_script)
|
print(secret_generator_script)
|
||||||
secret_generator = subprocess.run(
|
secret_generator = subprocess.run(
|
||||||
[secret_generator_script],
|
[secret_generator_script],
|
||||||
check=True,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if secret_generator.returncode != 0:
|
if secret_generator.returncode != 0:
|
||||||
@ -40,7 +43,7 @@ def get_secret_script(machine: str) -> None:
|
|||||||
|
|
||||||
|
|
||||||
def generate_command(args: argparse.Namespace) -> None:
|
def generate_command(args: argparse.Namespace) -> None:
|
||||||
get_secret_script(args.machine)
|
generate_secrets(args.machine)
|
||||||
|
|
||||||
|
|
||||||
def register_generate_parser(parser: argparse.ArgumentParser) -> None:
|
def register_generate_parser(parser: argparse.ArgumentParser) -> None:
|
||||||
|
Loading…
Reference in New Issue
Block a user