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/pnp.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu/1systems/pnp.nix') diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 8791ad1d7..ca7caa35f 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -7,7 +7,6 @@ imports = [ ../. - ../2configs/tinc-basic-retiolum.nix ../2configs/headless.nix ../../krebs/3modules/Reaktor.nix @@ -20,6 +19,7 @@ ]; + krebs.retiolum.enable = true; virtualisation.graphics = false; # also export secrets, see Usage above fileSystems = pkgs.lib.mkVMOverride { -- 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/pnp.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'makefu/1systems/pnp.nix') diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index ca7caa35f..4b8d39c89 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -43,10 +43,8 @@ krebs.build.host = config.krebs.hosts.pnp; - nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; - networking.firewall.allowedTCPPorts = [ - 25 + 25 ]; } -- cgit v1.2.3