ma 1 omo: replace crypt2

This commit is contained in:
makefu 2016-03-08 18:35:32 +01:00
parent e8679ae6c0
commit ef97cc848f
2 changed files with 7 additions and 6 deletions

View File

@ -272,6 +272,7 @@ with config.krebs.lib;
addrs6 = ["42:f9f0::10"]; addrs6 = ["42:f9f0::10"];
aliases = [ aliases = [
"omo.retiolum" "omo.retiolum"
"omo.r"
]; ];
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----

View File

@ -10,8 +10,8 @@ let
homePartition = byid "ata-INTEL_SSDSA2M080G2GC_CVPO003402PB080BGN-part3"; homePartition = byid "ata-INTEL_SSDSA2M080G2GC_CVPO003402PB080BGN-part3";
# cryptsetup luksFormat $dev --cipher aes-xts-plain64 -s 512 -h sha512 # cryptsetup luksFormat $dev --cipher aes-xts-plain64 -s 512 -h sha512
# cryptsetup luksAddKey $dev tmpkey # cryptsetup luksAddKey $dev tmpkey
# cryptsetup luksOpen $dev crypt0 # cryptsetup luksOpen $dev crypt0 --key-file tmpkey --keyfile-size=4096
# mkfs.xfs /dev/mapper/crypt0 -L crypt0 # mkfs.ext4 /dev/mapper/crypt0 -L crypt0 -T largefile
# omo Chassis: # omo Chassis:
# __FRONT_ # __FRONT_
@ -27,10 +27,10 @@ let
# |_______| # |_______|
cryptDisk0 = byid "ata-ST2000DM001-1CH164_Z240XTT6"; cryptDisk0 = byid "ata-ST2000DM001-1CH164_Z240XTT6";
cryptDisk1 = byid "ata-TP02000GB_TPW151006050068"; cryptDisk1 = byid "ata-TP02000GB_TPW151006050068";
# cryptDisk2 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WCAZA5548487"; cryptDisk2 = byid "ata-ST4000DM000-1F2168_Z303HVSG";
cryptDisk3 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WMAZA1786907"; # cryptDisk3 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WMAZA1786907";
# all physical disks # all physical disks
allDisks = [ rootDisk cryptDisk0 cryptDisk1 cryptDisk3 ]; allDisks = [ rootDisk cryptDisk0 cryptDisk1 cryptDisk2 ];
in { in {
imports = imports =
[ [
@ -99,7 +99,7 @@ in {
(usbkey "home" homePartition) (usbkey "home" homePartition)
(usbkey "crypt0" cryptDisk0) (usbkey "crypt0" cryptDisk0)
(usbkey "crypt1" cryptDisk1) (usbkey "crypt1" cryptDisk1)
(usbkey "crypt2" cryptDisk3) (usbkey "crypt2" cryptDisk2)
]; ];
}; };
loader.grub.device = rootDisk; loader.grub.device = rootDisk;