summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-11-04 13:43:46 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2015-11-04 13:43:46 +0100
commit06c389c254f3419e8f24d128d0d0da8acbc74dd0 (patch)
tree8c399bd85d05b7b76afbbafcf586db50bb2c3e39
parent59baa69274654bcdb656c702292b4c7f856ca47b (diff)
downloadnixos-06c389c254f3419e8f24d128d0d0da8acbc74dd0.tar
nixos-06c389c254f3419e8f24d128d0d0da8acbc74dd0.tar.gz
nixos-06c389c254f3419e8f24d128d0d0da8acbc74dd0.tar.bz2
nixos-06c389c254f3419e8f24d128d0d0da8acbc74dd0.tar.xz
nixos-06c389c254f3419e8f24d128d0d0da8acbc74dd0.zip
syntax poking
-rw-r--r--custom/tinc/def.nix2
-rw-r--r--ymir.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix
index 237b6dee..ce893efb 100644
--- a/custom/tinc/def.nix
+++ b/custom/tinc/def.nix
@@ -14,7 +14,7 @@ in
14 14
15 options = { 15 options = {
16 16
17 services.tinc = { 17 services.customTinc = {
18 18
19 networks = mkOption { 19 networks = mkOption {
20 default = { }; 20 default = { };
diff --git a/ymir.nix b/ymir.nix
index 2251b7cd..d0191532 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -145,7 +145,7 @@ in {
145 chmod 0640 /etc/shadow 145 chmod 0640 /etc/shadow
146 ''; 146 '';
147 147
148 config.services.customTinc.networks = (pkgs.callPackage ./custom/yggdrasil.nix { 148 services.customTinc.networks = (pkgs.callPackage ./custom/yggdrasil.nix {
149 connect = false; 149 connect = false;
150 ipConf = { 150 ipConf = {
151 ip4 = [ { address = "10.141.4.1"; prefixLength = 16; } ]; 151 ip4 = [ { address = "10.141.4.1"; prefixLength = 16; } ];