diff options
| author | lassulus <lass@aidsballs.de> | 2016-03-06 01:56:23 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-03-06 01:56:23 +0100 |
| commit | 5d4c4b389652bb1c9160fd0d00db7ac69bcff4f2 (patch) | |
| tree | 1e325aff76ef6ece25df13c97a55237d97772ad3 /makefu | |
| parent | a973f194b8dc824a2144da7da736d5085bb6d462 (diff) | |
| parent | e8679ae6c0fd33be9c84a671d2ebfae51f5851f0 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/omo.nix | 20 | ||||
| -rw-r--r-- | makefu/3modules/snapraid.nix | 2 |
2 files changed, 18 insertions, 4 deletions
diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix index ca0bfd2b5..e6a1434ab 100644 --- a/makefu/1systems/omo.nix +++ b/makefu/1systems/omo.nix @@ -12,11 +12,25 @@ let # cryptsetup luksAddKey $dev tmpkey # cryptsetup luksOpen $dev crypt0 # mkfs.xfs /dev/mapper/crypt0 -L crypt0 + + # omo Chassis: + # __FRONT_ + # |* d2 | + # | | + # |* d3 | + # | | + # |* d0 | + # | | + # |* d1 | + # |* | + # | * r0 | + # |_______| cryptDisk0 = byid "ata-ST2000DM001-1CH164_Z240XTT6"; cryptDisk1 = byid "ata-TP02000GB_TPW151006050068"; - cryptDisk2 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WCAZA5548487"; + # cryptDisk2 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WCAZA5548487"; + cryptDisk3 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WMAZA1786907"; # all physical disks - allDisks = [ rootDisk cryptDisk0 cryptDisk1 cryptDisk2 ]; + allDisks = [ rootDisk cryptDisk0 cryptDisk1 cryptDisk3 ]; in { imports = [ @@ -85,7 +99,7 @@ in { (usbkey "home" homePartition) (usbkey "crypt0" cryptDisk0) (usbkey "crypt1" cryptDisk1) - (usbkey "crypt2" cryptDisk2) + (usbkey "crypt2" cryptDisk3) ]; }; loader.grub.device = rootDisk; diff --git a/makefu/3modules/snapraid.nix b/makefu/3modules/snapraid.nix index 3d458bbbf..acdeb46d8 100644 --- a/makefu/3modules/snapraid.nix +++ b/makefu/3modules/snapraid.nix @@ -35,7 +35,7 @@ let enable = mkEnableOption "snapraid"; timerConfig = mkOption { - type = types.unspecified; + type = with types;attrsOf str; description = '' Start snapraid service ''; |