From f5e1235d01e989437bb1352c403a5c9d4afcb3d3 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 11 Mar 2016 02:10:34 +0100 Subject: ma 2 tinc-basic-retiolum: RIP --- makefu/1systems/gum.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'makefu/1systems/gum.nix') diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index 906c72de..3976a1eb 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -7,7 +7,6 @@ let in { imports = [ ../. - ../2configs/tinc-basic-retiolum.nix ../2configs/headless.nix ../2configs/fs/simple-swap.nix ../2configs/fs/single-partition-ext4.nix @@ -29,11 +28,20 @@ in { ###### stable krebs.build.host = config.krebs.hosts.gum; - krebs.retiolum.extraConfig = '' - ListenAddress = ${external-ip} 53 - ListenAddress = ${external-ip} 655 - ListenAddress = ${external-ip} 21031 - ''; + krebs.retiolum = { + enable = true; + extraConfig = '' + ListenAddress = ${external-ip} 53 + ListenAddress = ${external-ip} 655 + ListenAddress = ${external-ip} 21031 + ''; + connectTo = [ + "muhbaasu" "tahoe" "flap" "wry" + "ire" "cd" "mkdir" "rmdir" + "fastpoke" "prism" "dishfire" "echelon" "cloudkrebs" + ]; + }; + krebs.nginx.servers.cgit.server-names = [ "cgit.euer.krebsco.de" ]; -- cgit v1.2.3 From 2e317bfe747ec968d3b933ae4c0df68ad204021c Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 15 Mar 2016 13:20:14 +0100 Subject: ma 2: use tinc-pre per default --- makefu/1systems/gum.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'makefu/1systems/gum.nix') diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index 3976a1eb..e784fdc1 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -24,7 +24,6 @@ in { ]; services.smartd.devices = [ { device = "/dev/sda";} ]; - nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; ###### stable krebs.build.host = config.krebs.hosts.gum; -- cgit v1.2.3