refactor pnp

This commit is contained in:
makefu 2015-08-07 12:53:02 +02:00
parent 91a112c242
commit 4d460eb95f
5 changed files with 44 additions and 60 deletions

View File

@ -11,6 +11,8 @@
../2configs/base.nix ../2configs/base.nix
../2configs/cgit-retiolum.nix ../2configs/cgit-retiolum.nix
../2configs/graphite-standalone.nix ../2configs/graphite-standalone.nix
../2configs/vm-single-partition.nix
../2configs/tinc-basic-retiolum.nix
]; ];
krebs.build.host = config.krebs.hosts.pnp; krebs.build.host = config.krebs.hosts.pnp;
krebs.build.user = config.krebs.users.makefu; krebs.build.user = config.krebs.users.makefu;
@ -21,50 +23,21 @@
url = https://github.com/NixOS/nixpkgs; url = https://github.com/NixOS/nixpkgs;
rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870"; 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 = [ networking.firewall.allowedTCPPorts = [
# nginx runs on 80 # nginx runs on 80
80
# graphite-web runs on 8080, carbon cache runs on 2003 tcp and udp # graphite-web runs on 8080, carbon cache runs on 2003 tcp and udp
8080 2003 80
]; 8080 2003
];
networking.firewall.allowedUDPPorts = [ 2003 ]; networking.firewall.allowedUDPPorts = [ 2003 ];
networking.firewall.rejectPackets = true; networking.firewall.rejectPackets = true;
networking.firewall.allowPing = 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 # $ nix-env -qaP | grep wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
jq jq
]; ];
} }

View File

@ -5,6 +5,7 @@
with lib; with lib;
{ {
imports = [ ]; imports = [ ];
services.graphite = { services.graphite = {
web = { web = {
enable = true; enable = true;

View File

@ -1,24 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
{
imports = [ ];
services.graphite = {
web = {
enable = true;
host = "0.0.0.0";
};
carbon = {
enableCache = true;
storageSchemas = ''
[carbon]
pattern = ^carbon\.
retentions = 60:90d
[default]
pattern = .*
retentions = 60s:30d,300s:1y
'';
};
};
}

View File

@ -0,0 +1,14 @@
{ config, lib, pkgs, ... }:
with lib;
{
krebs.retiolum = {
enable = true;
hosts = ../../Zhosts;
connectTo = [
"gum"
"pigstarter"
"fastpoke"
];
};
}

View File

@ -0,0 +1,20 @@
{ config, lib, pkgs, ... }:
# vda1 ext4 (label nixos) -> only root partition
with lib;
{
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/vda";
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
};
hardware.enableAllFirmware = true;
nixpkgs.config.allowUnfree = true;
hardware.cpu.amd.updateMicrocode = true;
}