New host definitions in VPNs

3 files changed, 3 insertions, 1 deletions

diff --git a/custom/tinc/generate_hostfile.hs b/custom/tinc/generate_hostfile.hs
index 6d4217fd..a781fed6 100755
--- a/custom/tinc/generate_hostfile.hs
+++ b/custom/tinc/generate_hostfile.hs
@@ -9,8 +9,10 @@ main = readDirectory "." >>= putStrLn . genHostFile
 genHostFile :: AnchoredDirTree String -> String
 genHostFile (_ :/ (Dir _ contents)) = "{\n" ++ entries ++ "\n}\n"
   where
-    entries = concatMap $ [genEntry name content | (File name content) <- contents]
+    entries = concat $ [genEntry name content | (File name content) <- contents, name `notElem` hidden]
     genEntry fileName fileContent = unlines . indent $ [ "\"" ++ fileName ++ "\" = ''" ] ++ indent (lines fileContent) ++ [ "'';" ]
+    hidden = [ "hosts.nix"
+             ]
 
 indent :: [String] -> [String]
 indent = map ("  " ++)
diff --git a/laeradhr b/laeradhr
-Subproject ae41b8e91dec5767f8b8bd0274bc39917c0781a
+Subproject 58177eb1a8b66e80c53c52112297461afaf2ebf
diff --git a/yggdrasil b/yggdrasil
-Subproject d000521f283ae6d3df15047c4f069aaf40dcf97
+Subproject 6fe6b93090cffcfd22a3e73d4628193422c0cc2