Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s 2 base: fix user,pubkey,secrets path

Browse Source
This commit is contained in:
makefu 2015-12-22 16:42:28 +01:00
parent adbe4a5b4a
commit 9ec4c5df3d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shared/2configs/base.nix
View File

@ -13,6 +13,8 @@ with lib;
]; ];
}; };
# TODO rename shared user to "krebs"
krebs.build.user = config.krebs.users.shared;
krebs.build.source = { krebs.build.source = {
git.nixpkgs = { git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs; url = https://github.com/NixOS/nixpkgs;
@ -20,7 +22,7 @@ with lib;
}; };
dir.secrets = { dir.secrets = {
host = config.krebs.current.host; host = config.krebs.current.host;
path = mkDefault "${getEnv "HOME"}/secrets/krebs/wolf"; path = mkDefault "${getEnv "HOME"}/secrets/krebs/${config.krebs.build.host.name}";
}; };
dir.stockholm = { dir.stockholm = {
host = config.krebs.current.host; host = config.krebs.current.host;
@ -65,7 +67,7 @@ with lib;
config.krebs.users.lass.pubkey config.krebs.users.lass.pubkey
config.krebs.users.makefu.pubkey config.krebs.users.makefu.pubkey
# TODO HARDER: # TODO HARDER:
(readFile ../../krebs/Zpubkeys/makefu_omo.ssh.pub) config.krebs.users.makefu-omo.pubkey
config.krebs.users.tv.pubkey config.krebs.users.tv.pubkey
]; ];