diff options
Diffstat (limited to 'makefu/1systems')
| -rw-r--r-- | makefu/1systems/pnp.nix | 17 | ||||
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 45 | ||||
| -rw-r--r-- | makefu/1systems/repunit.nix | 3 | ||||
| -rw-r--r-- | makefu/1systems/tsp.nix | 15 |
4 files changed, 67 insertions, 13 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 6693dc066..963d07744 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -10,9 +10,12 @@ <nixpkgs/nixos/modules/profiles/qemu-guest.nix> ../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; @@ -21,16 +24,20 @@ krebs.build.deps = { nixpkgs = { url = https://github.com/NixOS/nixpkgs; - rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870"; + rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; }; }; 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 ]; } diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix new file mode 100644 index 000000000..415c1af30 --- /dev/null +++ b/makefu/1systems/pornocauster.nix @@ -0,0 +1,45 @@ +# +# +# +{ config, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ../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/virtualization.nix + ../2configs/wwan.nix + + # hardware specifics are in here + ../2configs/tp-x220.nix + ]; + + krebs.build.host = config.krebs.hosts.pornocauster; + krebs.build.user = config.krebs.users.makefu; + krebs.build.target = "root@pornocauster"; + + networking.firewall.allowedTCPPorts = [ + 25 + ]; + + krebs.build.deps = { + nixpkgs = { + url = https://github.com/NixOS/nixpkgs; + #url = https://github.com/makefu/nixpkgs; + rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; + }; + }; +} diff --git a/makefu/1systems/repunit.nix b/makefu/1systems/repunit.nix index 7596a3d54..503fe8f65 100644 --- a/makefu/1systems/repunit.nix +++ b/makefu/1systems/repunit.nix @@ -18,7 +18,8 @@ krebs.build.deps = { nixpkgs = { url = https://github.com/NixOS/nixpkgs; - rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870"; + #url = https://github.com/makefu/nixpkgs; + rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; }; secrets = { url = "/home/makefu/secrets/${config.krebs.build.host.name}"; diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix index 388ded068..67db22460 100644 --- a/makefu/1systems/tsp.nix +++ b/makefu/1systems/tsp.nix @@ -11,28 +11,29 @@ ../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 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 ]; 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"; + url = https://github.com/NixOS/nixpkgs; + #url = https://github.com/makefu/nixpkgs; + rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; }; }; - } |