From b3c25831d1ac80578222cc7d0e8f3559f92f34c1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 5 Aug 2015 14:56:38 +0200
Subject: add graphite to pnp

---
 makefu/1systems/pnp.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'makefu/1systems/pnp.nix')

diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index 549658983..a8df522f2 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -10,6 +10,7 @@
       <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
       ../2configs/base.nix
       ../2configs/cgit-retiolum.nix
+      ../2configs/graphite-standalone.nix
     ];
   krebs.build.host = config.krebs.hosts.pnp;
   krebs.build.user = config.krebs.users.makefu;
@@ -38,8 +39,13 @@
   hardware.enableAllFirmware = true;
   hardware.cpu.amd.updateMicrocode = true;
 
-# networking.firewall is enabled by default
-  networking.firewall.allowedTCPPorts = [ 80 ];
+  networking.firewall.allowedTCPPorts = [
+  # nginx runs on 80
+                                          80
+  # graphite-web runs on 8080, carbon cache runs on 2003 tcp and udp
+                                          8080 2003
+                                        ];
+  networking.firewall.allowedUDPPorts = [ 2003 ];
   networking.firewall.rejectPackets = true;
   networking.firewall.allowPing = true;
 
-- 
cgit v1.2.3


From 4d460eb95f398797df4d502be496a79481bdd809 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 7 Aug 2015 12:53:02 +0200
Subject: refactor pnp

---
 makefu/1systems/pnp.nix | 45 +++++++++------------------------------------
 1 file changed, 9 insertions(+), 36 deletions(-)

(limited to 'makefu/1systems/pnp.nix')

diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index a8df522f2..bc4c679b7 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -11,6 +11,8 @@
       ../2configs/base.nix
       ../2configs/cgit-retiolum.nix
       ../2configs/graphite-standalone.nix
+      ../2configs/vm-single-partition.nix
+      ../2configs/tinc-basic-retiolum.nix
     ];
   krebs.build.host = config.krebs.hosts.pnp;
   krebs.build.user = config.krebs.users.makefu;
@@ -21,50 +23,21 @@
       url = https://github.com/NixOS/nixpkgs;
       rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
     };
-    secrets = {
-      url = "/home/makefu/secrets/${config.krebs.build.host.name}";
-    };
-    stockholm = {
-      url = toString ../..;
-    };
   };
 
-  boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
-  boot.loader.grub.device = "/dev/vda";
-
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "virtio_blk" ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-  hardware.enableAllFirmware = true;
-  hardware.cpu.amd.updateMicrocode = true;
-
   networking.firewall.allowedTCPPorts = [
   # nginx runs on 80
-                                          80
   # graphite-web runs on 8080, carbon cache runs on 2003 tcp and udp
-                                          8080 2003
-                                        ];
+    80
+    8080 2003
+  ];
   networking.firewall.allowedUDPPorts = [ 2003 ];
+
   networking.firewall.rejectPackets = true;
   networking.firewall.allowPing = true;
 
-  fileSystems."/" =
-  { device = "/dev/disk/by-label/nixos";
-    fsType = "ext4";
-  };
-  krebs.retiolum = {
-    enable = true;
-    hosts = ../../Zhosts;
-    connectTo = [
-      "gum"
-      "pigstarter"
-      "fastpoke"
-    ];
-  };
-
 # $ nix-env -qaP | grep wget
-    environment.systemPackages = with pkgs; [
-      jq
-    ];
+  environment.systemPackages = with pkgs; [
+    jq
+  ];
 }
-- 
cgit v1.2.3


From 7a378d230d4c75f77f04943b73ad4c883d6750b9 Mon Sep 17 00:00:00 2001
From: makefu <makefu@tsp>
Date: Tue, 11 Aug 2015 19:00:22 +0000
Subject: makefu: move more stuff into base.nix

---
 makefu/1systems/pnp.nix | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'makefu/1systems/pnp.nix')

diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix
index bc4c679b7..6693dc066 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp.nix
@@ -33,11 +33,4 @@
   ];
   networking.firewall.allowedUDPPorts = [ 2003 ];
 
-  networking.firewall.rejectPackets = true;
-  networking.firewall.allowPing = true;
-
-# $ nix-env -qaP | grep wget
-  environment.systemPackages = with pkgs; [
-    jq
-  ];
 }
-- 
cgit v1.2.3