restructuring

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
           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/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 {
   "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.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 = ''