From bf9ac632c4264d08edb9b64786c48c2dc9331fb9 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 4 Nov 2015 14:26:18 +0100 Subject: New host definitions in VPNs --- custom/tinc/generate_hostfile.hs | 4 +++- laeradhr | 2 +- yggdrasil | 2 +- 3 files changed, 5 insertions(+), 3 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 index ae41b8e9..58177eb1 160000 --- a/laeradhr +++ b/laeradhr @@ -1 +1 @@ -Subproject commit ae41b8e91dec5767f8b8bd0274bc39917c0781ac +Subproject commit 58177eb1a8b66e80c53c52112297461afaf2ebf2 diff --git a/yggdrasil b/yggdrasil index d000521f..6fe6b930 160000 --- a/yggdrasil +++ b/yggdrasil @@ -1 +1 @@ -Subproject commit d000521f283ae6d3df15047c4f069aaf40dcf973 +Subproject commit 6fe6b93090cffcfd22a3e73d4628193422c0cc27 -- cgit v1.2.3