From f51088e6f792874bbfc4a6a4475f1467e4ad91ee Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 4 Nov 2015 14:08:56 +0100
Subject: restructuring

---
 custom/tinc/def.nix             | 2 +-
 custom/tinc/hosts/laeradhr.nix  | 1 +
 custom/tinc/hosts/yggdrasil.nix | 1 +
 custom/tinc/laeradhr-hosts.nix  | 1 -
 custom/tinc/laeradhr.nix        | 2 +-
 custom/tinc/yggdrasil-hosts.nix | 1 -
 custom/tinc/yggdrasil.nix       | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 create mode 120000 custom/tinc/hosts/laeradhr.nix
 create mode 120000 custom/tinc/hosts/yggdrasil.nix
 delete mode 120000 custom/tinc/laeradhr-hosts.nix
 delete mode 120000 custom/tinc/yggdrasil-hosts.nix

(limited to 'custom/tinc')

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
           PIDFile = "/run/tinc.${network}.pid";
         };
         preStart = ''
-          ${pkgs.openresolv}/bin/resolvconf -d tinc.${network}
+          ${pkgs.openresolv}/bin/resolvconf -d tinc.${network} || true
 
           mkdir -p /etc/tinc/${network}/hosts
 
diff --git a/custom/tinc/hosts/laeradhr.nix b/custom/tinc/hosts/laeradhr.nix
new file mode 120000
index 00000000..e9de637e
--- /dev/null
+++ b/custom/tinc/hosts/laeradhr.nix
@@ -0,0 +1 @@
+../../laeradhr/hosts.nix
\ No newline at end of file
diff --git a/custom/tinc/hosts/yggdrasil.nix b/custom/tinc/hosts/yggdrasil.nix
new file mode 120000
index 00000000..cfba8242
--- /dev/null
+++ b/custom/tinc/hosts/yggdrasil.nix
@@ -0,0 +1 @@
+../../yggdrasil/hosts.nix
\ No newline at end of file
diff --git a/custom/tinc/laeradhr-hosts.nix b/custom/tinc/laeradhr-hosts.nix
deleted file mode 120000
index e9de637e..00000000
--- a/custom/tinc/laeradhr-hosts.nix
+++ /dev/null
@@ -1 +0,0 @@
-../../laeradhr/hosts.nix
\ No newline at end of file
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 {
   "laeradhr" = {
     inherit name;
     debugLevel = 2;
-    #hosts = ( import ./laeradhr-hosts.nix );
+    hosts = ( import ./hosts/laearadhr.nix );
     extraConfig = connectTo;
     scripts = {
       tinc-up = ''
diff --git a/custom/tinc/yggdrasil-hosts.nix b/custom/tinc/yggdrasil-hosts.nix
deleted file mode 120000
index cfba8242..00000000
--- a/custom/tinc/yggdrasil-hosts.nix
+++ /dev/null
@@ -1 +0,0 @@
-../../yggdrasil/hosts.nix
\ No newline at end of file
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 {
   "yggdrasil" = {
     inherit name;
     debugLevel = 2;
-    #hosts = ( import ./yggdrasil-hosts.nix );
+    hosts = ( import ./hosts/yggdrasil.nix );
     extraConfig = connectTo;
     scripts = {
       tinc-up = ''
-- 
cgit v1.2.3