From 8f14ff2f54167c8505de82f65d640a1bb0018f17 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 16 Aug 2017 11:49:17 +0200
Subject: ma darth: init full-disk-encryption

---
 makefu/1systems/darth/config.nix | 93 +++++++++++++++++++++++-----------------
 1 file changed, 54 insertions(+), 39 deletions(-)

diff --git a/makefu/1systems/darth/config.nix b/makefu/1systems/darth/config.nix
index 9dbe67429..7accb13d3 100644
--- a/makefu/1systems/darth/config.nix
+++ b/makefu/1systems/darth/config.nix
@@ -3,44 +3,62 @@
 with import <stockholm/lib>;
 let
   byid = dev: "/dev/disk/by-id/" + dev;
-  rootDisk = byid "ata-ADATA_SSD_S599_64GB_10460000000000000039";
-  auxDisk = byid "ata-HGST_HTS721010A9E630_JR10006PH3A02F";
-  dataPartition = auxDisk + "-part1";
+  rootDisk = byid "ata-INTEL_SSDSC2BW480H6_CVTR53120385480EGN";
+  bootPart = rootDisk + "-part1";
+  rootPart = rootDisk + "-part2";
 
   allDisks = [ rootDisk ]; # auxDisk
 in {
   imports = [
       <stockholm/makefu>
-      <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
+      <stockholm/makefu/2configs/fs/sda-crypto-root.nix>
+      <stockholm/makefu/2configs/sshd-totp.nix>
       <stockholm/makefu/2configs/zsh-user.nix>
       <stockholm/makefu/2configs/smart-monitor.nix>
       <stockholm/makefu/2configs/exim-retiolum.nix>
-      <stockholm/makefu/2configs/virtualisation/libvirt.nix>
+      # <stockholm/makefu/2configs/virtualisation/libvirt.nix>
 
       <stockholm/makefu/2configs/tinc/retiolum.nix>
-      <stockholm/makefu/2configs/share/temp-share-samba.nix>
+      <stockholm/makefu/2configs/tools/core.nix>
+      <stockholm/makefu/2configs/stats/client.nix>
+      <stockholm/makefu/2configs/nsupdate-data.nix>
+
+      # SIEM
+      #<stockholm/makefu/2configs/tinc/siem.nix>
+      # {services.tinc.networks.siem = {
+      #     name = "sdarth";
+      #     extraConfig = "ConnectTo = sjump";
+      #   };
+      # }
+
+      # {
+      #   makefu.forward-journal = {
+      #     enable = true;
+      #     src = "10.8.10.2";
+      #     dst = "10.8.10.6";
+      #   };
+      # }
+
+      ## Sharing
+      # <stockholm/makefu/2configs/share/temp-share-samba.nix>
+      #{
+      #  services.samba.shares = {
+      #      isos = {
+      #        path = "/data/isos/";
+      #        "read only" = "yes";
+      #        browseable = "yes";
+      #        "guest ok" = "yes";
+      #      };
+      #  };
+      #}
+      <stockholm/makefu/2configs/share/anon-ftp.nix>
   ];
-  services.samba.shares = {
-      isos = {
-        path = "/data/isos/";
-        "read only" = "yes";
-        browseable = "yes";
-        "guest ok" = "yes";
-      };
-  };
-  services.tinc.networks.siem = {
-    name = "sdarth";
-    extraConfig = "ConnectTo = sjump";
-  };
 
-  makefu.forward-journal = {
-    enable = true;
-    src = "10.8.10.2";
-    dst = "10.8.10.6";
-  };
 
-  #networking.firewall.enable = false;
 
+  #networking.firewall.enable = false;
+  makefu.server.primary-itf = "enp0s25";
+  krebs.hidden-ssh.enable = true;
   boot.kernelModules = [ "coretemp" "f71882fg" ];
   hardware.enableAllFirmware = true;
   nixpkgs.config.allowUnfree = true;
@@ -49,31 +67,28 @@ in {
     firewall = {
       allowPing = true;
       logRefusedConnections = false;
-      trustedInterfaces = [ "eno1" ];
+      # trustedInterfaces = [ "eno1" ];
       allowedUDPPorts = [ 80 655 1655 67 ];
       allowedTCPPorts = [ 80 655 1655 ];
     };
     # fallback connection to the internal virtual network
-    interfaces.virbr3.ip4 =  [{
-      address = "10.8.8.2";
-      prefixLength = 24;
-    }];
+    # interfaces.virbr3.ip4 =  [{
+    #   address = "10.8.8.2";
+    #   prefixLength = 24;
+    # }];
   };
 
   # TODO smartd omo darth gum all-in-one
   services.smartd.devices = builtins.map (x: { device = x; }) allDisks;
-  zramSwap.enable = true;
-
-  #fileSystems."/data" = {
-  #  device = dataPartition;
-  #  fsType = "ext4";
-  #};
 
   boot.loader.grub.device = rootDisk;
-
-  users.users.root.openssh.authorizedKeys.keys = [
-    config.krebs.users.makefu-omo.pubkey
-    config.krebs.users.makefu-vbob.pubkey
+  boot.initrd.luks.devices = [
+    { name = "luksroot";
+      device = rootPart;
+      allowDiscards = true;
+      keyFileSize = 4096;
+      keyFile = "/dev/sdb";
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.darth;
-- 
cgit v1.2.3