summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcustom/tinc/generate_hostfile.hs3
-rw-r--r--hel.nix1
2 files changed, 3 insertions, 1 deletions
diff --git a/custom/tinc/generate_hostfile.hs b/custom/tinc/generate_hostfile.hs
index a781fed6..70be98dc 100755
--- a/custom/tinc/generate_hostfile.hs
+++ b/custom/tinc/generate_hostfile.hs
@@ -1,4 +1,5 @@
1#!/usr/bin/env runhaskell 1#! /usr/bin/env nix-shell
2#! nix-shell -i runghc shell.nix
2 3
3import System.Directory.Tree 4import System.Directory.Tree
4import Data.List 5import Data.List
diff --git a/hel.nix b/hel.nix
index 852d9731..6830ad26 100644
--- a/hel.nix
+++ b/hel.nix
@@ -92,6 +92,7 @@
92 92
93 customTinc.networks = ((import ./custom/tinc/yggdrasil.nix) { 93 customTinc.networks = ((import ./custom/tinc/yggdrasil.nix) {
94 inherit (pkgs) stdenv nettools openresolv; 94 inherit (pkgs) stdenv nettools openresolv;
95 connect = true;
95 name = "hel"; 96 name = "hel";
96 ipConf = { 97 ipConf = {
97 ip4 = [ { address = "10.141.5.1"; prefixLength = 16; } ]; 98 ip4 = [ { address = "10.141.5.1"; prefixLength = 16; } ];