diff options
| author | makefu <github@syntax-fehler.de> | 2019-01-16 11:43:10 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2019-01-16 11:43:10 +0100 |
| commit | e3851e0c69490d19351e0bcef64c23c9070d1d19 (patch) | |
| tree | a3d1de2957f7c7c2502a399614264852c652cf49 /krebs/3modules | |
| parent | 33655bfd89f7ea6f8ab3e3139cd79f4c2d2a0ef6 (diff) | |
| parent | 6cef97deb3a96731a4737f05513e2e5855f60685 (diff) | |
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/per-user.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/tinc.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/krebs/3modules/per-user.nix b/krebs/3modules/per-user.nix index a7a07a8e6..5beb859aa 100644 --- a/krebs/3modules/per-user.nix +++ b/krebs/3modules/per-user.nix @@ -13,7 +13,7 @@ in { }); default = {}; }; - config = { + config = mkIf (cfg != {}) { environment = { etc = mapAttrs' diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix index ecd449b09..24eac7158 100644 --- a/krebs/3modules/tinc.nix +++ b/krebs/3modules/tinc.nix @@ -27,6 +27,7 @@ let "tinc.conf" = pkgs.writeText "${netname}-tinc.conf" '' Name = ${tinc.config.host.name} Interface = ${netname} + Broadcast = no ${concatMapStrings (c: "ConnectTo = ${c}\n") tinc.config.connectTo} PrivateKeyFile = ${tinc.config.privkey.path} Port = ${toString tinc.config.host.nets.${netname}.tinc.port} |