Merged with unhead changes

This commit is contained in:
2021-10-11 15:04:51 -07:00
8 changed files with 115 additions and 116 deletions

View File

@@ -11,6 +11,7 @@ with lib; {
./fudo/backplane
./fudo/chat.nix
./fudo/client/dns.nix
./fudo/deploy.nix
./fudo/distributed-builds.nix
./fudo/dns.nix
./fudo/domains.nix

View File

@@ -1,3 +1,4 @@
{ config, pkgs, lib, ... }:
with lib;

View File

@@ -6,7 +6,8 @@ let
in {
config = {
users.usersroot.openssh.authorizedKeys.keys = mkIf (site-cfg.deploy-pubkeys != null)
site-cfg.deploy-pubkeys;
users.users.root.openssh.authorizedKeys.keys =
mkIf (site-cfg.deploy-pubkeys != null)
site-cfg.deploy-pubkeys;
};
}

View File

@@ -22,6 +22,11 @@ in {
description = "Domain name of the current local host.";
};
local-profile = mkOption {
type = str;
description = "Profile name of the current local host.";
};
local-site = mkOption {
type = str;
description = "Site name of the current local host.";
@@ -58,18 +63,20 @@ in {
local-domain = config.fudo.hosts.${local-host}.domain;
local-site = config.fudo.hosts.${local-host}.site;
host-user-list = config.fudo.hosts."${local-host}".local-users;
host = config.fudo.hosts.${local-host};
host-user-list = host.local-users;
domain-user-list = config.fudo.domains."${local-domain}".local-users;
site-user-list = config.fudo.sites."${local-site}".local-users;
local-users =
getAttrs (host-user-list ++ domain-user-list ++ site-user-list) config.fudo.users;
host-admin-list = config.fudo.hosts."${local-host}".local-admins;
host-admin-list = host.local-admins;
domain-admin-list = config.fudo.domains."${local-domain}".local-admins;
site-admin-list = config.fudo.sites."${local-site}".local-admins;
local-admins = host-admin-list ++ domain-admin-list ++ site-admin-list;
host-group-list = config.fudo.hosts."${local-host}".local-groups;
host-group-list = host.local-groups;
domain-group-list = config.fudo.domains."${local-domain}".local-groups;
site-group-list = config.fudo.sites."${local-site}".local-groups;
local-groups =
@@ -86,6 +93,7 @@ in {
local-admins = local-admins;
local-groups = local-groups;
local-hosts = local-hosts;
local-profile = host.profile;
};
};
}