summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-08-23 16:53:38 +0200
committerlassulus <lass@aidsballs.de>2015-08-23 16:53:38 +0200
commit65a2d75b140e7eca79a8084ef331b1d4db8f07f5 (patch)
tree0d1cd09fe24c1eacaf550859a44ab1fa1d686e0e /makefu/1systems
parent8247a5a618d6b0fc3688077fe36508b8bf88dcc3 (diff)
parentdce1ad91445297ecc122f968a12339438eabaa63 (diff)
Merge branch 'makefu'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/pnp.nix15
-rw-r--r--makefu/1systems/pornocauster.nix40
-rw-r--r--makefu/1systems/tsp.nix11
3 files changed, 58 insertions, 8 deletions
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 @@
<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;
@@ -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 ];
}
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
new file mode 100644
index 000000000..218594533
--- /dev/null
+++ b/makefu/1systems/pornocauster.nix
@@ -0,0 +1,40 @@
+#
+#
+#
+{ config, pkgs, ... }:
+
+{
+ imports =
+ [ # Include the results of the hardware scan.
+ ../2configs/base.nix
+ ../2configs/main-laptop.nix #< base-gui
+
+ ../2configs/tinc-basic-retiolum.nix
+ #../2configs/sda-crypto-root.nix
+ ../2configs/sda-crypto-root-home.nix
+
+ ../2configs/zsh-user.nix
+ ../2configs/exim-retiolum.nix
+ #../2configs/disable_v6.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;
+ # rev=$(curl https://nixos.org/channels/nixos-unstable/git-revision -L)
+ url = https://github.com/makefu/nixpkgs;
+ rev = "f5fe787f778b872c6b2221598501c9310cb83915";
+ };
+ };
+}
diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
index 388ded068..887778c8f 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp.nix
@@ -11,17 +11,20 @@
../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
];
@@ -31,8 +34,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";
};
};
-
}