kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity

fix authorized keys

Browse source
This commit is contained in:
Kiara Grouwstra 2025-04-22 19:19:22 +02:00
parent 41648d6e8d
commit 4bd2cc3eb8
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
infra/common/resource.nix
View file

@ -5,7 +5,7 @@
}: }:
let let
inherit (lib) elem mkDefault; inherit (lib) attrValues elem mkDefault;
inherit (lib.attrsets) concatMapAttrs optionalAttrs; inherit (lib.attrsets) concatMapAttrs optionalAttrs;
inherit (lib.strings) removeSuffix; inherit (lib.strings) removeSuffix;
@ -34,4 +34,8 @@ in
${removeSuffix ".age" name}.file = secretsPrefix + "/${name}"; ${removeSuffix ".age" name}.file = secretsPrefix + "/${name}";
} }
) secrets; ) secrets;
## FIXME: Remove direct root authentication once the NixOps4 NixOS provider
## supports users with password-less sudo.
users.users.root.openssh.authorizedKeys.keys = attrValues keys.contributors;
} }

2
infra/dev/main.tf
View file

@ -14,7 +14,7 @@ module "nixos" {
# wiki = "vm02187" # does not resolve # wiki = "vm02187" # does not resolve
# forgejo = "vm02116" # does not resolve # forgejo = "vm02116" # does not resolve
# TODO: move these to a separate `host` dir # TODO: move these to a separate `host` dir
# dns = "fedi200" # does not accept root user dns = "fedi200"
fedipanel = "fedi201" fedipanel = "fedi201"
} : name => { } : name => {
hostname = inst hostname = inst

2
infra/operator/main.tf
View file

@ -64,7 +64,7 @@ module "nixos" {
## FIXME: switch root authentication to users with password-less sudo, see #24 ## FIXME: switch root authentication to users with password-less sudo, see #24
users.users.root.openssh.authorizedKeys.keys = let users.users.root.openssh.authorizedKeys.keys = let
keys = import ../../keys; keys = import ../../keys;
in builtins.attrValues keys.contributors ++ [ in [
# allow our panel vm access to the test machines # allow our panel vm access to the test machines
keys.panel keys.panel
]; ];