Merge remote-tracking branch 'uriel/master'

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 ];
 
 }