summaryrefslogtreecommitdiff
path: root/custom/tinc
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-11-04 14:08:56 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2015-11-04 14:08:56 +0100
commitf51088e6f792874bbfc4a6a4475f1467e4ad91ee (patch)
treee8e3ada52b497fa515cbb1ac99d1f6d3980d12f6 /custom/tinc
parent8ae56dd9af1e420a64ddb523f80d43df82f0d23e (diff)
downloadnixos-f51088e6f792874bbfc4a6a4475f1467e4ad91ee.tar
nixos-f51088e6f792874bbfc4a6a4475f1467e4ad91ee.tar.gz
nixos-f51088e6f792874bbfc4a6a4475f1467e4ad91ee.tar.bz2
nixos-f51088e6f792874bbfc4a6a4475f1467e4ad91ee.tar.xz
nixos-f51088e6f792874bbfc4a6a4475f1467e4ad91ee.zip
restructuring
Diffstat (limited to 'custom/tinc')
-rw-r--r--custom/tinc/def.nix2
l---------custom/tinc/hosts/laeradhr.nix (renamed from custom/tinc/laeradhr-hosts.nix)0
l---------custom/tinc/hosts/yggdrasil.nix (renamed from custom/tinc/yggdrasil-hosts.nix)0
-rw-r--r--custom/tinc/laeradhr.nix2
-rw-r--r--custom/tinc/yggdrasil.nix2
5 files changed, 3 insertions, 3 deletions
diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix
index ce893efb..6db4e882 100644
--- a/custom/tinc/def.nix
+++ b/custom/tinc/def.nix
@@ -146,7 +146,7 @@ in
146 PIDFile = "/run/tinc.${network}.pid"; 146 PIDFile = "/run/tinc.${network}.pid";
147 }; 147 };
148 preStart = '' 148 preStart = ''
149 ${pkgs.openresolv}/bin/resolvconf -d tinc.${network} 149 ${pkgs.openresolv}/bin/resolvconf -d tinc.${network} || true
150 150
151 mkdir -p /etc/tinc/${network}/hosts 151 mkdir -p /etc/tinc/${network}/hosts
152 152
diff --git a/custom/tinc/laeradhr-hosts.nix b/custom/tinc/hosts/laeradhr.nix
index e9de637e..e9de637e 120000
--- a/custom/tinc/laeradhr-hosts.nix
+++ b/custom/tinc/hosts/laeradhr.nix
diff --git a/custom/tinc/yggdrasil-hosts.nix b/custom/tinc/hosts/yggdrasil.nix
index cfba8242..cfba8242 120000
--- a/custom/tinc/yggdrasil-hosts.nix
+++ b/custom/tinc/hosts/yggdrasil.nix
diff --git a/custom/tinc/laeradhr.nix b/custom/tinc/laeradhr.nix
index 7d57e413..fa9a0304 100644
--- a/custom/tinc/laeradhr.nix
+++ b/custom/tinc/laeradhr.nix
@@ -13,7 +13,7 @@ in {
13 "laeradhr" = { 13 "laeradhr" = {
14 inherit name; 14 inherit name;
15 debugLevel = 2; 15 debugLevel = 2;
16 #hosts = ( import ./laeradhr-hosts.nix ); 16 hosts = ( import ./hosts/laearadhr.nix );
17 extraConfig = connectTo; 17 extraConfig = connectTo;
18 scripts = { 18 scripts = {
19 tinc-up = '' 19 tinc-up = ''
diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix
index cc09804c..5fa76fe1 100644
--- a/custom/tinc/yggdrasil.nix
+++ b/custom/tinc/yggdrasil.nix
@@ -13,7 +13,7 @@ in {
13 "yggdrasil" = { 13 "yggdrasil" = {
14 inherit name; 14 inherit name;
15 debugLevel = 2; 15 debugLevel = 2;
16 #hosts = ( import ./yggdrasil-hosts.nix ); 16 hosts = ( import ./hosts/yggdrasil.nix );
17 extraConfig = connectTo; 17 extraConfig = connectTo;
18 scripts = { 18 scripts = {
19 tinc-up = '' 19 tinc-up = ''