From cbac1a75959c96d37f6c24a38efce19e88dadca2 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 31 Aug 2015 10:59:28 +0200 Subject: makefu: merge /Z -> krebs/Z --- makefu/1systems/repunit.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/repunit.nix b/makefu/1systems/repunit.nix index 503fe8f65..d98ff17c1 100644 --- a/makefu/1systems/repunit.nix +++ b/makefu/1systems/repunit.nix @@ -49,7 +49,7 @@ }; krebs.retiolum = { enable = true; - hosts = ../../Zhosts; + hosts = ../../krebs/Zhosts; connectTo = [ "gum" "pigstarter" -- cgit v1.2.3 From 4d917dfa98d1a324a73e3290d553114e7047a621 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 31 Aug 2015 14:25:27 +0200 Subject: makefu: enable Reaktor for pnp --- makefu/1systems/pnp.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'makefu/1systems') diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 963d07744..bbb99390d 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -21,6 +21,8 @@ krebs.build.user = config.krebs.users.makefu; krebs.build.target = "root@pnp"; + krebs.Reaktor.enable = true; + krebs.build.deps = { nixpkgs = { url = https://github.com/NixOS/nixpkgs; -- cgit v1.2.3 From e10d36bec7e4fb8cb82162c2e9bc86e58f2d5a0e Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 31 Aug 2015 19:56:47 +0200 Subject: add sample of how to extend the Reaktor config --- makefu/1systems/pornocauster.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'makefu/1systems') diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 415c1af30..1e2c31257 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -23,6 +23,8 @@ ../2configs/virtualization.nix ../2configs/wwan.nix + ../2configs/Reaktor/simpleExtend.nix + # hardware specifics are in here ../2configs/tp-x220.nix ]; -- cgit v1.2.3 From 37744f0016b77af41e8f57bc6da32b15f5ac50fd Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 2 Sep 2015 10:02:05 +0200 Subject: makefu: sort 2configs --- makefu/1systems/pnp.nix | 6 +++--- makefu/1systems/pornocauster.nix | 16 ++++++++++------ makefu/1systems/tsp.nix | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index bbb99390d..6ca1f1108 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -9,9 +9,9 @@ [ # Include the results of the hardware scan. ../2configs/base.nix - ../2configs/cgit-retiolum.nix + ../2configs/git/cgit-retiolum.nix # ../2configs/graphite-standalone.nix - ../2configs/vm-single-partition.nix + ../2configs/fs/vm-single-partition.nix ../2configs/tinc-basic-retiolum.nix ../2configs/exim-retiolum.nix @@ -26,7 +26,7 @@ krebs.build.deps = { nixpkgs = { url = https://github.com/NixOS/nixpkgs; - rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; + rev = "03921972268934d900cc32dad253ff383926771c"; }; }; diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 1e2c31257..4dcfe4eca 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -13,9 +13,7 @@ ../2configs/tinc-basic-retiolum.nix #../2configs/disable_v6.nix - #../2configs/sda-crypto-root.nix - ../2configs/sda-crypto-root-home.nix - + # environment ../2configs/zsh-user.nix # applications @@ -23,16 +21,22 @@ ../2configs/virtualization.nix ../2configs/wwan.nix - ../2configs/Reaktor/simpleExtend.nix + # services + ../2configs/git/brain-retiolum.nix + # ../2configs/Reaktor/simpleExtend.nix # hardware specifics are in here - ../2configs/tp-x220.nix + ../2configs/hw/tp-x220.nix + # mount points + ../2configs/fs/sda-crypto-root-home.nix ]; krebs.build.host = config.krebs.hosts.pornocauster; krebs.build.user = config.krebs.users.makefu; krebs.build.target = "root@pornocauster"; + #krebs.Reaktor.nickname = "makefu|r"; + networking.firewall.allowedTCPPorts = [ 25 ]; @@ -41,7 +45,7 @@ nixpkgs = { url = https://github.com/NixOS/nixpkgs; #url = https://github.com/makefu/nixpkgs; - rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; + rev = "03921972268934d900cc32dad253ff383926771c"; }; }; } diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix index 67db22460..3c2bb2eda 100644 --- a/makefu/1systems/tsp.nix +++ b/makefu/1systems/tsp.nix @@ -9,9 +9,9 @@ ../2configs/base.nix ../2configs/base-gui.nix ../2configs/tinc-basic-retiolum.nix - ../2configs/sda-crypto-root.nix + ../2configs/fs/sda-crypto-root.nix # hardware specifics are in here - ../2configs/tp-x200.nix #< imports tp-x2x0.nix + ../2configs/hw/tp-x200.nix #< imports tp-x2x0.nix ../2configs/disable_v6.nix ../2configs/rad1o.nix -- cgit v1.2.3 From d6d9956abc60548c755d30e6a5bd13c10abbb181 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 4 Sep 2015 23:06:43 +0200 Subject: makefu/pnp: uses new Reaktor infrastructure --- makefu/1systems/pnp.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 6ca1f1108..98f3ecd22 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -7,21 +7,33 @@ { imports = [ # Include the results of the hardware scan. - + # Base ../2configs/base.nix - ../2configs/git/cgit-retiolum.nix - # ../2configs/graphite-standalone.nix - ../2configs/fs/vm-single-partition.nix ../2configs/tinc-basic-retiolum.nix + # HW/FS + + ../2configs/fs/vm-single-partition.nix + + # Services + ../2configs/git/cgit-retiolum.nix + + ## Reaktor + ## \/ are only plugins, must enable Reaktor explicitly + ../2configs/Reaktor/stockholmLentil.nix + ../2configs/Reaktor/simpleExtend.nix + ../2configs/exim-retiolum.nix ../2configs/urlwatch.nix + + # ../2configs/graphite-standalone.nix ]; + krebs.Reaktor.enable = true; + krebs.build.host = config.krebs.hosts.pnp; krebs.build.user = config.krebs.users.makefu; krebs.build.target = "root@pnp"; - krebs.Reaktor.enable = true; krebs.build.deps = { nixpkgs = { -- cgit v1.2.3