3 krebs: make dns.providers part of api
This commit is contained in:
parent
4926abb00f
commit
98bc5991db
@ -34,6 +34,14 @@ let
|
||||
default = {};
|
||||
};
|
||||
|
||||
dns = {
|
||||
providers = mkOption {
|
||||
# TODO with types; tree dns.label dns.provider, so we can merge.
|
||||
# Currently providers can only be merged if aliases occur just once.
|
||||
type = with types; attrsOf unspecified;
|
||||
};
|
||||
};
|
||||
|
||||
hosts = mkOption {
|
||||
type = with types; attrsOf host;
|
||||
};
|
||||
@ -56,38 +64,26 @@ let
|
||||
{ krebs = makefu-imp; }
|
||||
{ krebs = tv-imp; }
|
||||
{
|
||||
krebs.dns.providers = {
|
||||
de.krebsco = "ovh";
|
||||
internet = "hosts";
|
||||
retiolum = "hosts";
|
||||
};
|
||||
|
||||
# XXX This overlaps with krebs.retiolum
|
||||
networking.extraHosts =
|
||||
let
|
||||
# TODO move domain name providers to a dedicated module
|
||||
# providers : tree label providername
|
||||
providers = {
|
||||
internet = "hosts";
|
||||
retiolum = "hosts";
|
||||
de.viljetic = "regfish";
|
||||
de.krebsco = "ovh";
|
||||
};
|
||||
|
||||
# splitByProvider : [alias] -> listset providername alias
|
||||
splitByProvider = foldl (acc: alias: listset-insert (providerOf alias) alias acc) {};
|
||||
|
||||
# providerOf : alias -> providername
|
||||
providerOf = alias:
|
||||
tree-get (splitString "." alias) providers;
|
||||
in
|
||||
concatStringsSep "\n" (flatten (
|
||||
# TODO deepMap ["hosts" "nets"] (hostname: host: netname: net:
|
||||
mapAttrsToList (hostname: host:
|
||||
mapAttrsToList (netname: net:
|
||||
let
|
||||
aliases = toString (unique (longs ++ shorts));
|
||||
longs = (splitByProvider net.aliases).hosts;
|
||||
shorts = map (removeSuffix ".${cfg.search-domain}") longs;
|
||||
in
|
||||
map (addr: "${addr} ${aliases}") net.addrs
|
||||
) host.nets
|
||||
) config.krebs.hosts
|
||||
));
|
||||
networking.extraHosts = concatStringsSep "\n" (flatten (
|
||||
mapAttrsToList (hostname: host:
|
||||
mapAttrsToList (netname: net:
|
||||
let
|
||||
aliases = toString (unique (longs ++ shorts));
|
||||
providers = dns.split-by-provider net.aliases cfg.dns.providers;
|
||||
longs = providers.hosts;
|
||||
shorts = map (removeSuffix ".${cfg.search-domain}") longs;
|
||||
in
|
||||
map (addr: "${addr} ${aliases}") net.addrs
|
||||
) host.nets
|
||||
) cfg.hosts
|
||||
));
|
||||
}
|
||||
];
|
||||
|
||||
@ -139,6 +135,9 @@ let
|
||||
};
|
||||
|
||||
tv-imp = {
|
||||
dns.providers = {
|
||||
de.viljetic = "regfish";
|
||||
};
|
||||
hosts = addNames {
|
||||
cd = {
|
||||
cores = 2;
|
||||
|
@ -12,22 +12,7 @@ builtins // lib // rec {
|
||||
|
||||
types = import ./types.nix { inherit lib; };
|
||||
|
||||
|
||||
# listset k v = set k [v]
|
||||
|
||||
# listset-insert : k -> v -> listset k v -> listset k v
|
||||
listset-insert = name: value: set:
|
||||
set // { ${name} = set.${name} or [] ++ [value]; };
|
||||
|
||||
# tree k v = set k (either v (tree k v))
|
||||
|
||||
# tree-get : [k] -> tree k v -> v
|
||||
tree-get = path: x:
|
||||
let
|
||||
y = x.${last path};
|
||||
in
|
||||
if typeOf y != "set"
|
||||
then y
|
||||
else tree-get (init path) y;
|
||||
|
||||
dns = import ./dns.nix { inherit lib; };
|
||||
listset = import ./listset.nix { inherit lib; };
|
||||
tree = import ./tree.nix { inherit lib; };
|
||||
}
|
||||
|
31
4lib/krebs/dns.nix
Normal file
31
4lib/krebs/dns.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib, ... }:
|
||||
|
||||
let
|
||||
listset = import ./listset.nix { inherit lib; };
|
||||
in
|
||||
|
||||
with builtins;
|
||||
with lib;
|
||||
|
||||
rec {
|
||||
# label = string
|
||||
|
||||
# TODO does it make sense to have alias = list label?
|
||||
|
||||
# split-by-provider :
|
||||
# [[label]] -> tree label provider -> listset provider alias
|
||||
split-by-provider = as: providers:
|
||||
foldl (m: a: listset.insert (provider-of a providers) a m) {} as;
|
||||
|
||||
# provider-of : alias -> tree label provider -> provider
|
||||
# Note that we cannot use tree.get here, because path can be longer
|
||||
# than the tree depth.
|
||||
provider-of = a:
|
||||
let
|
||||
go = path: tree:
|
||||
if typeOf tree == "string"
|
||||
then tree
|
||||
else go (tail path) tree.${head path};
|
||||
in
|
||||
go (reverseList (splitString "." a));
|
||||
}
|
11
4lib/krebs/listset.nix
Normal file
11
4lib/krebs/listset.nix
Normal file
@ -0,0 +1,11 @@
|
||||
{ lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
rec {
|
||||
# listset k v = set k [v]
|
||||
|
||||
# insert : k -> v -> listset k v -> listset k v
|
||||
insert = name: value: set:
|
||||
set // { ${name} = set.${name} or [] ++ [value]; };
|
||||
}
|
13
4lib/krebs/tree.nix
Normal file
13
4lib/krebs/tree.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{ lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
rec {
|
||||
# tree k v = set k (either v (tree k v))
|
||||
|
||||
# get : [k] -> tree k v -> v
|
||||
get = path: tree:
|
||||
if length path > 0
|
||||
then get (tail path) tree.${head path} # TODO check if elem exists
|
||||
else tree;
|
||||
}
|
Loading…
Reference in New Issue
Block a user