diff options
author | tv <tv@krebsco.de> | 2017-10-03 18:48:18 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2017-10-03 18:48:18 +0200 |
commit | d567c2c21e0fe029a069edda8eda28cd24771511 (patch) | |
tree | bcc1ea51b71b22c18ac653a1b4aded927e6c173e /krebs/3modules/tinc.nix | |
parent | 32a8fc0396769946242ef8c1a48fb64ae572e0db (diff) | |
parent | 902a65304d1e07ce5a7192a0403d6fa1bed1f135 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/3modules/tinc.nix')
-rw-r--r-- | krebs/3modules/tinc.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix index 8af15c13b..b032f3148 100644 --- a/krebs/3modules/tinc.nix +++ b/krebs/3modules/tinc.nix @@ -1,5 +1,5 @@ -{ config, pkgs, lib, ... }: with import <stockholm/lib>; +{ config, pkgs, ... }: let out = { options.krebs.tinc = api; @@ -11,7 +11,7 @@ let description = '' define a tinc network ''; - type = with types; attrsOf (submodule (tinc: { + type = types.attrsOf (types.submodule (tinc: { options = let netname = tinc.config._module.args.name; in { @@ -116,7 +116,7 @@ let phases = [ "installPhase" ]; installPhase = '' mkdir $out - ${concatStrings (lib.mapAttrsToList (_: host: '' + ${concatStrings (mapAttrsToList (_: host: '' echo ${shell.escape host.nets."${tinc.config.netname}".tinc.config} \ > $out/${shell.escape host.name} '') tinc.config.hosts)} |