summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-11-04 13:41:33 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2015-11-04 13:41:33 +0100
commit2db00f1538de87d4b535c8148ad066a80f07f94d (patch)
treee38a8ba1947e4dcd8eef2891c3af26e5ff4883fd
parent7fb7ebd91352df3f271f99e9fe4968837596676e (diff)
downloadnixos-2db00f1538de87d4b535c8148ad066a80f07f94d.tar
nixos-2db00f1538de87d4b535c8148ad066a80f07f94d.tar.gz
nixos-2db00f1538de87d4b535c8148ad066a80f07f94d.tar.bz2
nixos-2db00f1538de87d4b535c8148ad066a80f07f94d.tar.xz
nixos-2db00f1538de87d4b535c8148ad066a80f07f94d.zip
syntax poking
-rw-r--r--custom/tinc/def.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix
index 5412826b..8f3ec969 100644
--- a/custom/tinc/def.nix
+++ b/custom/tinc/def.nix
@@ -145,10 +145,9 @@ in
145 Type = "simple"; 145 Type = "simple";
146 PIDFile = "/run/tinc.${network}.pid"; 146 PIDFile = "/run/tinc.${network}.pid";
147 }; 147 };
148 preStart = ''
149 ${pkgs.openresolv}/bin/resolvconf -d tinc.${network} || true
150 '';
151 preStart = '' 148 preStart = ''
149 ${pkgs.openresolv}/bin/resolvconf -d tinc.${network}
150
152 mkdir -p /etc/tinc/${network}/hosts 151 mkdir -p /etc/tinc/${network}/hosts
153 152
154 # Determine how we should generate our keys 153 # Determine how we should generate our keys