Merge pull request 'update: use run_local command to print executed command' (#278) from Mic92-flake-archive into main
This commit is contained in:
commit
a66fe90b79
@ -10,32 +10,17 @@ def deploy_nixos(hosts: HostGroup) -> None:
|
|||||||
Deploy to all hosts in parallel
|
Deploy to all hosts in parallel
|
||||||
"""
|
"""
|
||||||
|
|
||||||
flake_store_paths = {}
|
|
||||||
for h in hosts.hosts:
|
|
||||||
flake_uri = str(h.meta.get("flake_uri", ".#"))
|
|
||||||
if flake_uri not in flake_store_paths:
|
|
||||||
res = subprocess.run(
|
|
||||||
[
|
|
||||||
"nix",
|
|
||||||
"--extra-experimental-features",
|
|
||||||
"nix-command flakes",
|
|
||||||
"flake",
|
|
||||||
"metadata",
|
|
||||||
"--json",
|
|
||||||
flake_uri,
|
|
||||||
],
|
|
||||||
check=True,
|
|
||||||
text=True,
|
|
||||||
stdout=subprocess.PIPE,
|
|
||||||
)
|
|
||||||
data = json.loads(res.stdout)
|
|
||||||
flake_store_paths[flake_uri] = data["path"]
|
|
||||||
|
|
||||||
def deploy(h: Host) -> None:
|
def deploy(h: Host) -> None:
|
||||||
target = f"{h.user or 'root'}@{h.host}"
|
target = f"{h.user or 'root'}@{h.host}"
|
||||||
flake_store_path = flake_store_paths[str(h.meta.get("flake_uri", ".#"))]
|
|
||||||
flake_path = str(h.meta.get("flake_path", "/etc/nixos"))
|
|
||||||
ssh_arg = f"-p {h.port}" if h.port else ""
|
ssh_arg = f"-p {h.port}" if h.port else ""
|
||||||
|
res = h.run_local(
|
||||||
|
["nix", "flake", "archive", "--to", f"ssh://{target}", "--json"],
|
||||||
|
check=True,
|
||||||
|
stdout=subprocess.PIPE,
|
||||||
|
extra_env=dict(NIX_SSHOPTS=ssh_arg),
|
||||||
|
)
|
||||||
|
data = json.loads(res.stdout)
|
||||||
|
path = data["path"]
|
||||||
|
|
||||||
if h.host_key_check != HostKeyCheck.STRICT:
|
if h.host_key_check != HostKeyCheck.STRICT:
|
||||||
ssh_arg += " -o StrictHostKeyChecking=no"
|
ssh_arg += " -o StrictHostKeyChecking=no"
|
||||||
@ -44,10 +29,6 @@ def deploy_nixos(hosts: HostGroup) -> None:
|
|||||||
|
|
||||||
ssh_arg += " -i " + h.key if h.key else ""
|
ssh_arg += " -i " + h.key if h.key else ""
|
||||||
|
|
||||||
h.run_local(
|
|
||||||
f"rsync --checksum -vaF --delete -e 'ssh {ssh_arg}' {flake_store_path}/ {target}:{flake_path}"
|
|
||||||
)
|
|
||||||
|
|
||||||
flake_attr = h.meta.get("flake_attr", "")
|
flake_attr = h.meta.get("flake_attr", "")
|
||||||
if flake_attr:
|
if flake_attr:
|
||||||
flake_attr = "#" + flake_attr
|
flake_attr = "#" + flake_attr
|
||||||
@ -71,7 +52,7 @@ def deploy_nixos(hosts: HostGroup) -> None:
|
|||||||
"--build-host",
|
"--build-host",
|
||||||
"",
|
"",
|
||||||
"--flake",
|
"--flake",
|
||||||
f"{flake_path}{flake_attr}",
|
f"{path}{flake_attr}",
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
if target_host:
|
if target_host:
|
||||||
|
Loading…
Reference in New Issue
Block a user