Migrate deprecated admin service to sshd + users
sshd carries the admin SSH keys and now also CA-signed host certificates (TOFU-less verification via the shared openssh-ca); the users service generates per-machine root passwords (share = false, no prompts).
This commit is contained in:
@@ -25,15 +25,30 @@ in
|
|||||||
|
|
||||||
inventory.instances = {
|
inventory.instances = {
|
||||||
|
|
||||||
admin = {
|
# Admin SSH keys + root password, split per the clan-core migration off
|
||||||
roles.default.tags.all = { };
|
# the deprecated `admin` service (sshd handles keys, users the password).
|
||||||
roles.default.settings.allowedKeys = {
|
sshd = {
|
||||||
|
roles.server.tags.all = { };
|
||||||
|
roles.server.settings.authorizedKeys = {
|
||||||
"berwn" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIENAjhGQGraQoAjJzsomKP8GAmQPeGL1rNRNHgRcLqtT";
|
"berwn" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIENAjhGQGraQoAjJzsomKP8GAmQPeGL1rNRNHgRcLqtT";
|
||||||
"kurogeek" =
|
"kurogeek" =
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEcZ/p1Ofa9liwIzPWzNtONhJ7+FUWd2lCz33r81t8+w kurogeek@kurogeek";
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEcZ/p1Ofa9liwIzPWzNtONhJ7+FUWd2lCz33r81t8+w kurogeek@kurogeek";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
root-user = {
|
||||||
|
module = {
|
||||||
|
name = "users";
|
||||||
|
input = "clan-core";
|
||||||
|
};
|
||||||
|
roles.default.tags.all = { };
|
||||||
|
roles.default.settings = {
|
||||||
|
user = "root";
|
||||||
|
prompt = false; # auto-generate, like the old admin service
|
||||||
|
share = false; # per-machine password, not fleet-wide
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
zerotier = {
|
zerotier = {
|
||||||
roles.controller.machines."control" = { };
|
roles.controller.machines."control" = { };
|
||||||
roles.peer.tags.all = { };
|
roles.peer.tags.all = { };
|
||||||
|
|||||||
Reference in New Issue
Block a user