From a97078ca589375c76721e2cdbb24197ee458fccf Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Mon, 17 Aug 2015 23:22:49 +0200 Subject: makefu/pnp: add urlwatch --- makefu/1systems/pnp.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 6693dc066..1147c20fe 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -10,9 +10,12 @@ ../2configs/base.nix ../2configs/cgit-retiolum.nix - ../2configs/graphite-standalone.nix + # ../2configs/graphite-standalone.nix ../2configs/vm-single-partition.nix ../2configs/tinc-basic-retiolum.nix + + ../2configs/exim-retiolum.nix + ../2configs/urlwatch.nix ]; krebs.build.host = config.krebs.hosts.pnp; krebs.build.user = config.krebs.users.makefu; @@ -27,10 +30,14 @@ networking.firewall.allowedTCPPorts = [ # nginx runs on 80 + 80 # graphite-web runs on 8080, carbon cache runs on 2003 tcp and udp - 80 - 8080 2003 + # 8080 2003 + + # smtp + 25 ]; - networking.firewall.allowedUDPPorts = [ 2003 ]; + + # networking.firewall.allowedUDPPorts = [ 2003 ]; } -- cgit v1.2.3 From 3496e869000f7b4059ec5c2597b0504f6cb855ea Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Mon, 17 Aug 2015 23:24:37 +0200 Subject: makefu:add urlwatch,exim-retiolum --- makefu/1systems/tsp.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix index 388ded068..638d2ca8a 100644 --- a/makefu/1systems/tsp.nix +++ b/makefu/1systems/tsp.nix @@ -15,13 +15,15 @@ ../2configs/disable_v6.nix ../2configs/rad1o.nix + + ../2configs/exim-retiolum.nix ]; # not working in vm krebs.build.host = config.krebs.hosts.tsp; krebs.build.user = config.krebs.users.makefu; krebs.build.target = "root@tsp"; - krebs.exim-retiolum.enable = true; + networking.firewall.allowedTCPPorts = [ 25 ]; @@ -31,8 +33,8 @@ #url = https://github.com/NixOS/nixpkgs; # rev=$(curl https://nixos.org/channels/nixos-unstable/git-revision -L) url = https://github.com/makefu/nixpkgs; - rev = "8b8b65da24f13f9317504e8bcba476f9161613fe"; + #rev = "8b8b65da24f13f9317504e8bcba476f9161613fe"; + rev = "f5fe787f778b872c6b2221598501c9310cb83915"; }; }; - } -- cgit v1.2.3 From f666c217906382bd63dddc83f7f822c1798c3df7 Mon Sep 17 00:00:00 2001 From: System administrator Date: Sat, 22 Aug 2015 23:28:41 +0000 Subject: add pornocauster systems --- makefu/1systems/pornocauster.nix | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 makefu/1systems/pornocauster.nix (limited to 'makefu/1systems') diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix new file mode 100644 index 000000000..b8ba9289b --- /dev/null +++ b/makefu/1systems/pornocauster.nix @@ -0,0 +1,43 @@ +# +# +# +{ config, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ../2configs/base.nix + ../2configs/base-gui.nix + ../2configs/tinc-basic-retiolum.nix + #../2configs/sda-crypto-root.nix + ../2configs/sda-crypto-root-home.nix + # hardware specifics are in here + ../2configs/tp-x200.nix + + #../2configs/disable_v6.nix + #../2configs/rad1o.nix + + #../2configs/exim-retiolum.nix + ]; + # not working in vm + krebs.build.host = config.krebs.hosts.pornocauster; + krebs.build.user = config.krebs.users.makefu; + krebs.build.target = "root@localhost"; + + boot.kernelModules = [ "kvm-intel" ]; + + + networking.firewall.allowedTCPPorts = [ + 25 + ]; + + krebs.build.deps = { + nixpkgs = { + #url = https://github.com/NixOS/nixpkgs; + # rev=$(curl https://nixos.org/channels/nixos-unstable/git-revision -L) + url = https://github.com/makefu/nixpkgs; + #rev = "8b8b65da24f13f9317504e8bcba476f9161613fe"; + rev = "f5fe787f778b872c6b2221598501c9310cb83915"; + }; + }; +} -- cgit v1.2.3 From 7a1e2f83b242b6779e1590082fbe93a8ed429611 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 23 Aug 2015 02:48:35 +0200 Subject: makefu: cleanup,refactoring after transfer --- makefu/1systems/pornocauster.nix | 17 +++++++++-------- makefu/1systems/tsp.nix | 3 ++- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index b8ba9289b..b6b7a59be 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -7,22 +7,24 @@ imports = [ # Include the results of the hardware scan. ../2configs/base.nix - ../2configs/base-gui.nix + ../2configs/main-laptop.nix #< base-gui + ../2configs/tinc-basic-retiolum.nix #../2configs/sda-crypto-root.nix ../2configs/sda-crypto-root-home.nix - # hardware specifics are in here - ../2configs/tp-x200.nix + ../2configs/zsh-user.nix + ../2configs/exim-retiolum.nix #../2configs/disable_v6.nix - #../2configs/rad1o.nix - #../2configs/exim-retiolum.nix + # hardware specifics are in here + ../2configs/tp-x220.nix ]; - # not working in vm + krebs.build.host = config.krebs.hosts.pornocauster; krebs.build.user = config.krebs.users.makefu; - krebs.build.target = "root@localhost"; + krebs.build.target = "root@pornocauster"; + boot.kernelModules = [ "kvm-intel" ]; @@ -36,7 +38,6 @@ #url = https://github.com/NixOS/nixpkgs; # rev=$(curl https://nixos.org/channels/nixos-unstable/git-revision -L) url = https://github.com/makefu/nixpkgs; - #rev = "8b8b65da24f13f9317504e8bcba476f9161613fe"; rev = "f5fe787f778b872c6b2221598501c9310cb83915"; }; }; diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix index 638d2ca8a..887778c8f 100644 --- a/makefu/1systems/tsp.nix +++ b/makefu/1systems/tsp.nix @@ -11,11 +11,12 @@ ../2configs/tinc-basic-retiolum.nix ../2configs/sda-crypto-root.nix # hardware specifics are in here - ../2configs/tp-x200.nix + ../2configs/tp-x200.nix #< imports tp-x2x0.nix ../2configs/disable_v6.nix ../2configs/rad1o.nix + ../2configs/zsh-user.nix ../2configs/exim-retiolum.nix ]; # not working in vm -- cgit v1.2.3 From 6c206726e33e51cfac947ada4ad5ec7e5e107830 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 23 Aug 2015 14:15:41 +0200 Subject: makefu: add button-3 scrolling to x220 config --- makefu/1systems/pornocauster.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index b6b7a59be..218594533 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -25,10 +25,6 @@ krebs.build.user = config.krebs.users.makefu; krebs.build.target = "root@pornocauster"; - - boot.kernelModules = [ "kvm-intel" ]; - - networking.firewall.allowedTCPPorts = [ 25 ]; -- cgit v1.2.3 From a0f6ac66e1420d9e3efa0443e05aee13b313b6d3 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 24 Aug 2015 11:06:10 +0200 Subject: makefu: add virtualization --- makefu/1systems/pornocauster.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 218594533..40aa5bb1f 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -9,13 +9,19 @@ ../2configs/base.nix ../2configs/main-laptop.nix #< base-gui + # Krebs ../2configs/tinc-basic-retiolum.nix + #../2configs/disable_v6.nix + #../2configs/sda-crypto-root.nix ../2configs/sda-crypto-root-home.nix ../2configs/zsh-user.nix + + # applications ../2configs/exim-retiolum.nix - #../2configs/disable_v6.nix + ../2configs/virtualization.nix + ../2configs/wwan.nix # hardware specifics are in here ../2configs/tp-x220.nix -- cgit v1.2.3