Merge remote-tracking branch 'ni/master'
This commit is contained in:
commit
4f8dbc57c4
|
@ -105,9 +105,7 @@ let
|
||||||
gg23 = "hosts";
|
gg23 = "hosts";
|
||||||
shack = "hosts";
|
shack = "hosts";
|
||||||
i = "hosts";
|
i = "hosts";
|
||||||
internet = "hosts";
|
|
||||||
r = "hosts";
|
r = "hosts";
|
||||||
retiolum = "hosts";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
krebs.users = {
|
krebs.users = {
|
||||||
|
@ -141,6 +139,29 @@ let
|
||||||
) cfg.hosts
|
) cfg.hosts
|
||||||
));
|
));
|
||||||
|
|
||||||
|
# TODO dedup with networking.extraHosts
|
||||||
|
nixpkgs.config.packageOverrides = oldpkgs:
|
||||||
|
let
|
||||||
|
domains = attrNames (filterAttrs (_: eq "hosts") cfg.dns.providers);
|
||||||
|
check = hostname: any (domain: hasSuffix ".${domain}" hostname) domains;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
retiolum-hosts = oldpkgs.writeText "retiolum-hosts" ''
|
||||||
|
${concatStringsSep "\n" (flatten (
|
||||||
|
map (host:
|
||||||
|
let
|
||||||
|
net = host.nets.retiolum;
|
||||||
|
aliases = longs;
|
||||||
|
longs = filter check net.aliases;
|
||||||
|
in
|
||||||
|
optionals
|
||||||
|
(aliases != [])
|
||||||
|
(map (addr: "${addr} ${toString aliases}") net.addrs)
|
||||||
|
) (filter (host: hasAttr "retiolum" host.nets)
|
||||||
|
(attrValues cfg.hosts))))}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
# Implements environment.etc."zones/<zone-name>"
|
# Implements environment.etc."zones/<zone-name>"
|
||||||
environment.etc = let
|
environment.etc = let
|
||||||
stripEmptyLines = s: (concatStringsSep "\n"
|
stripEmptyLines = s: (concatStringsSep "\n"
|
||||||
|
|
|
@ -413,8 +413,8 @@ with import <stockholm/lib>;
|
||||||
dv = {
|
dv = {
|
||||||
mail = "dv@alnus.r";
|
mail = "dv@alnus.r";
|
||||||
};
|
};
|
||||||
mv-cd = {
|
mv-ni = {
|
||||||
mail = "mv@cd.r";
|
mail = "mv@ni.r";
|
||||||
pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGer9e2+Lew7vnisgBbsFNECEIkpNJgEaqQqgb9inWkQ mv@vod";
|
pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGer9e2+Lew7vnisgBbsFNECEIkpNJgEaqQqgb9inWkQ mv@vod";
|
||||||
};
|
};
|
||||||
tv = {
|
tv = {
|
||||||
|
|
|
@ -21,7 +21,7 @@ with import <stockholm/lib>;
|
||||||
internet-aliases = with config.krebs.users; [
|
internet-aliases = with config.krebs.users; [
|
||||||
{ from = "bku-eppler@viljetic.de"; to = tv.mail; }
|
{ from = "bku-eppler@viljetic.de"; to = tv.mail; }
|
||||||
{ from = "postmaster@viljetic.de"; to = tv.mail; } # RFC 822
|
{ from = "postmaster@viljetic.de"; to = tv.mail; } # RFC 822
|
||||||
{ from = "mirko@viljetic.de"; to = mv-cd.mail; }
|
{ from = "mirko@viljetic.de"; to = mv-ni.mail; }
|
||||||
{ from = "tomislav@viljetic.de"; to = tv.mail; }
|
{ from = "tomislav@viljetic.de"; to = tv.mail; }
|
||||||
{ from = "tv@destroy.dyn.shackspace.de"; to = tv.mail; }
|
{ from = "tv@destroy.dyn.shackspace.de"; to = tv.mail; }
|
||||||
{ from = "tv@viljetic.de"; to = tv.mail; }
|
{ from = "tv@viljetic.de"; to = tv.mail; }
|
||||||
|
|
|
@ -33,6 +33,9 @@ let {
|
||||||
cgit.desc = "dict.leo.org command line interface";
|
cgit.desc = "dict.leo.org command line interface";
|
||||||
};
|
};
|
||||||
get = {};
|
get = {};
|
||||||
|
hstool = {
|
||||||
|
cgit.desc = "Haskell Development Environment ^_^";
|
||||||
|
};
|
||||||
htgen = {
|
htgen = {
|
||||||
cgit.desc = "toy HTTP server";
|
cgit.desc = "toy HTTP server";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user