From 7e43b2cc3e7eb903f972003ea8cd21fad97ae9f5 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 21:35:36 +0200 Subject: krebs.users: populate if enable, not via default --- 3modules/krebs/default.nix | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) (limited to '3modules/krebs/default.nix') diff --git a/3modules/krebs/default.nix b/3modules/krebs/default.nix index 979cc35ad..9aec879f9 100644 --- a/3modules/krebs/default.nix +++ b/3modules/krebs/default.nix @@ -14,10 +14,12 @@ let ]; options.krebs = api; config = mkIf cfg.enable (mkMerge [ - imp { krebs.hosts = lass-hosts; } { krebs.hosts = makefu-hosts; } { krebs.hosts = tv-hosts; } + { krebs.users = lass-users; } + { krebs.users = makefu-users; } + { krebs.users = tv-users; } ]); }; @@ -33,28 +35,24 @@ let }; }; - imp = { - krebs.users = addNames { - lass = { - pubkey = readFile ../../Zpubkeys/lass.ssh.pub; - }; - makefu = { - pubkey = readFile ../../Zpubkeys/makefu.ssh.pub; - }; - tv = { - pubkey = readFile ../../Zpubkeys/tv_wu.ssh.pub; - }; - uriel = { - pubkey = readFile ../../Zpubkeys/uriel.ssh.pub; - }; - }; - }; - lass-hosts = addNames { }; + lass-users = addNames { + lass = { + pubkey = readFile ../../Zpubkeys/lass.ssh.pub; + }; + uriel = { + pubkey = readFile ../../Zpubkeys/uriel.ssh.pub; + }; + }; makefu-hosts = addNames { }; + makefu-users = addNames { + makefu = { + pubkey = readFile ../../Zpubkeys/makefu.ssh.pub; + }; + }; tv-hosts = addNames { cd = { @@ -209,6 +207,11 @@ let secure = true; }; }; + tv-users = addNames { + tv = { + pubkey = readFile ../../Zpubkeys/tv_wu.ssh.pub; + }; + }; in out -- cgit v1.2.3