summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/pnp.nix
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/pnp.nix
parent8247a5a618d6b0fc3688077fe36508b8bf88dcc3 (diff)
parentdce1ad91445297ecc122f968a12339438eabaa63 (diff)
Merge branch 'makefu'
Diffstat (limited to 'makefu/1systems/pnp.nix')
-rw-r--r--makefu/1systems/pnp.nix15
1 files changed, 11 insertions, 4 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 ];
}