sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump deploykit version

Browse source
This commit is contained in:
Jörg Thalheim 2022-08-31 11:28:46 +02:00
parent 34439e6333
commit d27fde76e1
2 changed files with 6 additions and 5 deletions

6
flake.lock generated
View file

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1661774097, "lastModified": 1661934387,
"narHash": "sha256-dvWpOU3dU9TfSnK7I+CSDrCaASr+uR5VepG/SQs/RIg=", "narHash": "sha256-eK/PTfINcn4bVZShPXYEB73kf8OyiUwCMKArVZvOo/k=",
"owner": "numtide", "owner": "numtide",
"repo": "deploykit", "repo": "deploykit",
"rev": "c8cd9ddcd647e3116b07e920e53aebf047cbeac5", "rev": "8e0ecd709355b4d87cfab35c5d570ab1b0ae0b13",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
tasks.py
View file

@ -18,8 +18,9 @@ def deploy_nixos(hosts: List[DeployHost]) -> None:
g = DeployGroup(hosts) g = DeployGroup(hosts)
def deploy(h: DeployHost) -> None: def deploy(h: DeployHost) -> None:
target = f"{h.user or 'root'}@{h.host}"
h.run_local( h.run_local(
f"rsync {' --exclude '.join([''] + RSYNC_EXCLUDES)} -vaF --delete -e ssh . {h.user}@{h.host}:/etc/nixos" f"rsync {' --exclude '.join([''] + RSYNC_EXCLUDES)} -vaF --delete -e ssh . {target}:/etc/nixos"
) )
# FIXME: build03 has itself as a builder and deadlocks building packages. # FIXME: build03 has itself as a builder and deadlocks building packages.
@ -134,7 +135,7 @@ def nixos_install(c, hosts=""):
def get_hosts(hosts: str) -> List[DeployHost]: def get_hosts(hosts: str) -> List[DeployHost]:
if hosts == "": if hosts == "":
return [DeployHost(f"build{n + 1:02d}.nix-community.org") for n in range(4)] return [DeployHost(f"build{n + 1:02d}.nix-community.org", user="root") for n in range(4)]
return [DeployHost(f"{h}.nix-community.org") for h in hosts.split(",")] return [DeployHost(f"{h}.nix-community.org") for h in hosts.split(",")]