summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-07-23 02:00:23 +0200
committertv <tv@shackspace.de>2015-07-23 02:00:23 +0200
commit791a7e79977de76908ab9e33eb64cbd2b02da3ed (patch)
treeb4c51ae628c80015430b90c3fd1d96d8fd33319a
parent7a40f89e01593adff35f943aa86492ac4281d4e8 (diff)
4 tv: tinc.config can access tinc.pubkey
-rw-r--r--4lib/tv/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/4lib/tv/default.nix b/4lib/tv/default.nix
index 5eb9ac45f..092a9626c 100644
--- a/4lib/tv/default.nix
+++ b/4lib/tv/default.nix
@@ -97,22 +97,22 @@ builtins // lib // rec {
type = listOf hostname;
};
tinc = mkOption {
- type = submodule {
+ type = let net-config = config; in submodule ({ config, ... }: {
options = {
config = mkOption {
type = str;
apply = _: ''
- ${optionalString (config.via != null)
- (concatMapStringsSep "\n" (a: "Address = ${a}") config.via.addrs)}
- ${concatMapStringsSep "\n" (a: "Subnet = ${a}") config.addrs}
- ${config.tinc.pubkey}
+ ${optionalString (net-config.via != null)
+ (concatMapStringsSep "\n" (a: "Address = ${a}") net-config.via.addrs)}
+ ${concatMapStringsSep "\n" (a: "Subnet = ${a}") net-config.addrs}
+ ${config.pubkey}
'';
};
pubkey = mkOption {
type = str;
};
};
- };
+ });
};
};
});