diff options
author | tv <tv@shackspace.de> | 2015-08-13 17:09:56 +0200 |
---|---|---|
committer | tv <tv@shackspace.de> | 2015-08-13 17:09:56 +0200 |
commit | a33f90358d0f57025daddb0ae41d65707fb34cf3 (patch) | |
tree | 7f91c889c45fd8995af98d91b0670fb0e90b1d53 /makefu/1systems/pnp.nix | |
parent | 9f92ba455c4b13f4d960bae65cd577c9aad30dc4 (diff) | |
parent | 4366ffd6c5d401e3719a588f5ac98365aef8bd89 (diff) |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'makefu/1systems/pnp.nix')
-rw-r--r-- | makefu/1systems/pnp.nix | 48 |
1 files changed, 10 insertions, 38 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 54965898..6693dc06 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -10,6 +10,9 @@ <nixpkgs/nixos/modules/profiles/qemu-guest.nix> ../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; @@ -20,45 +23,14 @@ 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 + # graphite-web runs on 8080, carbon cache runs on 2003 tcp and udp + 80 + 8080 2003 + ]; + networking.firewall.allowedUDPPorts = [ 2003 ]; -# networking.firewall is enabled by default - networking.firewall.allowedTCPPorts = [ 80 ]; - 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 - ]; } |