krebs.users: populate if enable, not via default

This commit is contained in:
tv 2015-07-24 21:35:36 +02:00
parent b61f19e6ed
commit 7e43b2cc3e

View File

@ -14,10 +14,12 @@ let
]; ];
options.krebs = api; options.krebs = api;
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [
imp
{ krebs.hosts = lass-hosts; } { krebs.hosts = lass-hosts; }
{ krebs.hosts = makefu-hosts; } { krebs.hosts = makefu-hosts; }
{ krebs.hosts = tv-hosts; } { krebs.hosts = tv-hosts; }
{ krebs.users = lass-users; }
{ krebs.users = makefu-users; }
{ krebs.users = tv-users; }
]); ]);
}; };
@ -33,28 +35,24 @@ let
}; };
}; };
imp = { lass-hosts = addNames {
krebs.users = addNames { };
lass-users = addNames {
lass = { lass = {
pubkey = readFile ../../Zpubkeys/lass.ssh.pub; pubkey = readFile ../../Zpubkeys/lass.ssh.pub;
}; };
makefu = {
pubkey = readFile ../../Zpubkeys/makefu.ssh.pub;
};
tv = {
pubkey = readFile ../../Zpubkeys/tv_wu.ssh.pub;
};
uriel = { uriel = {
pubkey = readFile ../../Zpubkeys/uriel.ssh.pub; pubkey = readFile ../../Zpubkeys/uriel.ssh.pub;
}; };
}; };
};
lass-hosts = addNames {
};
makefu-hosts = addNames { makefu-hosts = addNames {
}; };
makefu-users = addNames {
makefu = {
pubkey = readFile ../../Zpubkeys/makefu.ssh.pub;
};
};
tv-hosts = addNames { tv-hosts = addNames {
cd = { cd = {
@ -209,6 +207,11 @@ let
secure = true; secure = true;
}; };
}; };
tv-users = addNames {
tv = {
pubkey = readFile ../../Zpubkeys/tv_wu.ssh.pub;
};
};
in in
out out