diff options
author | makefu <github@syntax-fehler.de> | 2015-08-07 15:50:26 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-08-07 15:50:26 +0200 |
commit | d38809879df79be835de25d0d7531c8c0eb6423a (patch) | |
tree | ad491ce214d982d9f1ac92ca7fcb9c5636562d01 /makefu/1systems/pnp.nix | |
parent | 2499c472a08783d1cc1105c9b4c48b04f8062b5b (diff) | |
parent | a919ddb3878c59f1306d8d22f46b603aceb90e27 (diff) |
Merge branch 'tsp-vicious'
Diffstat (limited to 'makefu/1systems/pnp.nix')
-rw-r--r-- | makefu/1systems/pnp.nix | 45 |
1 files changed, 9 insertions, 36 deletions
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 + ]; } |