summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/default.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2019-01-21 11:04:37 +0100
committertv <tv@krebsco.de>2019-01-21 11:04:37 +0100
commitaf0463b23493d8c31ce725beb8ff5a2fd0398001 (patch)
tree370eefe71046a3d33d4a74338549418c78835ef0 /krebs/3modules/default.nix
parent799f132d588f2a5f6c6dabc43e862c90d9efa4b7 (diff)
krebs: move hosts to dedeicated file
Diffstat (limited to 'krebs/3modules/default.nix')
-rw-r--r--krebs/3modules/default.nix25
1 files changed, 1 insertions, 24 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index ea4d03ad..bb69bfad 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -28,6 +28,7 @@ let
./git.nix
./go.nix
./hidden-ssh.nix
+ ./hosts.nix
./htgen.nix
./iana-etc.nix
./iptables.nix
@@ -61,11 +62,6 @@ let
api = {
enable = mkEnableOption "krebs";
- hosts = mkOption {
- type = with types; attrsOf host;
- default = {};
- };
-
users = mkOption {
type = with types; attrsOf user;
};
@@ -129,25 +125,6 @@ let
};
};
- networking.extraHosts = let
- domains = attrNames (filterAttrs (_: eq "hosts") cfg.dns.providers);
- check = hostname: any (domain: hasSuffix ".${domain}" hostname) domains;
- in concatStringsSep "\n" (flatten (
- mapAttrsToList (hostname: host:
- mapAttrsToList (netname: net:
- let
- aliases = longs ++ shorts;
- longs = filter check net.aliases;
- shorts = let s = ".${cfg.dns.search-domain}"; in
- map (removeSuffix s) (filter (hasSuffix s) longs);
- in
- optionals
- (aliases != [])
- (map (addr: "${addr} ${toString aliases}") net.addrs)
- ) (filterAttrs (name: host: host.aliases != []) host.nets)
- ) cfg.hosts
- ));
-
services.openssh.hostKeys =
let inherit (config.krebs.build.host.ssh) privkey; in
mkIf (privkey != null) (mkForce [privkey]);