From ef97cc848f379f84dcbe1aa3ed327bd5c30dadc2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 8 Mar 2016 18:35:32 +0100
Subject: [PATCH] ma 1 omo: replace crypt2

---
 krebs/3modules/makefu/default.nix |  1 +
 makefu/1systems/omo.nix           | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index 24f0cdd84..1fcf07b1e 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -272,6 +272,7 @@ with config.krebs.lib;
           addrs6 = ["42:f9f0::10"];
           aliases = [
             "omo.retiolum"
+            "omo.r"
           ];
           tinc.pubkey = ''
               -----BEGIN RSA PUBLIC KEY-----
diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index e6a1434ab..aa4a8a5c9 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -10,8 +10,8 @@ let
   homePartition = byid "ata-INTEL_SSDSA2M080G2GC_CVPO003402PB080BGN-part3";
   # cryptsetup luksFormat $dev --cipher aes-xts-plain64 -s 512 -h sha512
   # cryptsetup luksAddKey $dev tmpkey
-  # cryptsetup luksOpen $dev crypt0
-  # mkfs.xfs /dev/mapper/crypt0 -L crypt0
+  # cryptsetup luksOpen $dev crypt0 --key-file tmpkey --keyfile-size=4096
+  # mkfs.ext4 /dev/mapper/crypt0 -L crypt0 -T largefile
 
   # omo Chassis:
   # __FRONT_
@@ -27,10 +27,10 @@ let
   # |_______|
   cryptDisk0 = byid "ata-ST2000DM001-1CH164_Z240XTT6";
   cryptDisk1 = byid "ata-TP02000GB_TPW151006050068";
-  # cryptDisk2 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WCAZA5548487";
-  cryptDisk3 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WMAZA1786907";
+  cryptDisk2 = byid "ata-ST4000DM000-1F2168_Z303HVSG";
+  # cryptDisk3 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WMAZA1786907";
   # all physical disks
-  allDisks = [ rootDisk cryptDisk0 cryptDisk1 cryptDisk3 ];
+  allDisks = [ rootDisk cryptDisk0 cryptDisk1 cryptDisk2 ];
 in {
   imports =
     [
@@ -99,7 +99,7 @@ in {
         (usbkey "home" homePartition)
         (usbkey "crypt0" cryptDisk0)
         (usbkey "crypt1" cryptDisk1)
-        (usbkey "crypt2" cryptDisk3)
+        (usbkey "crypt2" cryptDisk2)
       ];
     };
     loader.grub.device = rootDisk;