From b7e643b1b6bfee9c594c9d898c59ac985cf00c87 Mon Sep 17 00:00:00 2001 From: Sven Slootweg Date: Mon, 1 Jun 2020 01:50:49 +0200 Subject: [PATCH] Add konjassiem-02 machine --- configuration/data/nodes.nix | 5 +++ .../machine-konjassiem-02.cryto.net.pub | 1 + configuration/default.nix | 11 +++++++ .../machine-konjassiem-02.nix | 32 +++++++++++++++++++ 4 files changed, 49 insertions(+) create mode 100644 configuration/data/tinc-keys/machine-konjassiem-02.cryto.net.pub create mode 100644 configuration/hardware-configurations/machine-konjassiem-02.nix diff --git a/configuration/data/nodes.nix b/configuration/data/nodes.nix index fa5f877..8726a5a 100644 --- a/configuration/data/nodes.nix +++ b/configuration/data/nodes.nix @@ -9,4 +9,9 @@ internalIpv4 = "10.217.0.6"; tincPublicKey = builtins.readFile ./tinc-keys/machine-borg2-01.cryto.net.pub; }; + "machine-konjassiem-02.cryto.net" = { + ipv4 = "81.4.122.123"; + internalIpv4 = "10.217.0.7"; + tincPublicKey = builtins.readFile ./tinc-keys/machine-konjassiem-02.cryto.net.pub; + }; } diff --git a/configuration/data/tinc-keys/machine-konjassiem-02.cryto.net.pub b/configuration/data/tinc-keys/machine-konjassiem-02.cryto.net.pub new file mode 100644 index 0000000..4ee8b5b --- /dev/null +++ b/configuration/data/tinc-keys/machine-konjassiem-02.cryto.net.pub @@ -0,0 +1 @@ +NKfdfCXEVrVOs+t5j3vNp36ym0e+8h66Lb3YPYWe9DG diff --git a/configuration/default.nix b/configuration/default.nix index 2c355cb..db2b388 100644 --- a/configuration/default.nix +++ b/configuration/default.nix @@ -270,4 +270,15 @@ in { }; }; }; + + "machine-konjassiem-02.cryto.net" = { pkgs, lib, config, ... }@args: { + system.stateVersion = "20.03"; + + imports = [ + presets.base + presets.kvm + ./hardware-configurations/machine-konjassiem-02.nix + (tincConfiguration { hostname = "machine-konjassiem-02.cryto.net"; nodes = nodes; }) + ]; + }; } diff --git a/configuration/hardware-configurations/machine-konjassiem-02.nix b/configuration/hardware-configurations/machine-konjassiem-02.nix new file mode 100644 index 0000000..b0e1c6f --- /dev/null +++ b/configuration/hardware-configurations/machine-konjassiem-02.nix @@ -0,0 +1,32 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, ... }: + +{ + imports = + [ + ]; + + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + boot.loader.grub.device = lib.mkForce "/dev/vda"; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/df8e6a13-8975-4c25-9d6b-b7065cc27086"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/8a56fa7d-ec2d-4814-b77e-688c0446624c"; + fsType = "ext4"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/b5a55d95-9dfc-4efd-8296-23db4bcf1f1e"; } + ]; + + nix.maxJobs = lib.mkDefault 2; +}