diff options
| author | makefu <github@syntax-fehler.de> | 2015-11-05 11:10:14 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-11-05 11:10:14 +0100 |
| commit | 625cfe81a09e3d9d19311188d80387292962ac72 (patch) | |
| tree | 25d1d0807715bbaec23862a21554f32e0417ce71 /krebs | |
| parent | 8995bdd5fc7ea8ef54b4e30ceb50825ba23054ba (diff) | |
| parent | 1ddbdddc696316986b07376a7fc5e33aaf228e89 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/tv/default.nix | 3 | ||||
| -rw-r--r-- | krebs/default.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 4c295dffe..302d1a92c 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -158,7 +158,8 @@ with lib; }; }; secure = true; - ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILn7C3LxAs9kUynENdRNgQs4qjrhNDfXzlHTpVJt6e09"; + ssh.privkey.path = <secrets/ssh.id_ed25519>; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILMPMh3nHxVcPqM+LrkK7eYxNJY1ShBXOTg1vlSR45wx"; }; ok = { nets = { diff --git a/krebs/default.nix b/krebs/default.nix index 31a7f7d04..bfd6175d9 100644 --- a/krebs/default.nix +++ b/krebs/default.nix @@ -84,6 +84,7 @@ let out = { cat<<EOF # put following into config.krebs.hosts.$system: + ssh.privkey.path = <secrets/ssh.$key_type>; ssh.pubkey = $(echo $pubkey | jq -R .); EOF ''; @@ -178,7 +179,7 @@ let out = { nix-path = lib.concatStringsSep ":" - (lib.mapAttrsToList (name: _: "${name}=/root/${name}") + (lib.mapAttrsToList (name: src: "${name}=${src.target-path}") (config.krebs.build.source.dir // config.krebs.build.source.git)); in '' |