forked from fediversity/fediversity
fix nix-hash
This commit is contained in:
parent
0b11397daa
commit
457493c3ee
1 changed files with 8 additions and 1 deletions
|
|
@ -37,7 +37,7 @@ locals {
|
|||
# FIXME settle for pwd when in /nix/store?
|
||||
# FIXME calculate separately to reduce false positives
|
||||
data "external" "hash" {
|
||||
program = ["sh", "-c", "echo '{\"hash\":\"$(nix-hash ..)\"}'"]
|
||||
program = ["sh", "-c", "echo \"{\\\"hash\\\":\\\"$(nix-hash ..)\\\"}\""]
|
||||
}
|
||||
|
||||
# TF resource to build and deploy NixOS instances.
|
||||
|
|
@ -102,6 +102,13 @@ resource "terraform_data" "nixos" {
|
|||
];
|
||||
# nix path for debugging
|
||||
nix.nixPath = [ "${local.nix_path}" ];
|
||||
## FIXME: switch root authentication to users with password-less sudo, see #24
|
||||
users.users.root.openssh.authorizedKeys.keys = let
|
||||
keys = import ../keys;
|
||||
in attrValues keys.contributors ++ [
|
||||
# allow our panel vm access to the test machines
|
||||
keys.panel
|
||||
];
|
||||
} //
|
||||
# template parameters passed in from TF thru json
|
||||
builtins.fromJSON "${replace(jsonencode({
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue