This commit is contained in:
Raphael Numbus
2025-12-06 19:46:43 +01:00
parent 1b675ac0f9
commit 0946cc7b08
2 changed files with 8 additions and 6 deletions
+2 -2
View File
@@ -21,13 +21,13 @@ let
# This assumes the keyfiles are stored at /etc/secrets/disks/data-disk-1, /etc/secrets/disks/parity-disk-1, etc. # This assumes the keyfiles are stored at /etc/secrets/disks/data-disk-1, /etc/secrets/disks/parity-disk-1, etc.
# and that the LUKS devices are named luks-data-1, luks-parity-1, etc. in disk-config.nix. # and that the LUKS devices are named luks-data-1, luks-parity-1, etc. in disk-config.nix.
luksDataDevices = lib.lists.foldl' luksDataDevices = lib.lists.foldl'
(acc: path: let index = builtins.elemAt (lib.strings.splitString "-" path) 2; in (acc: path: let index = builtins.elemAt (lib.strings.splitString "-" path) 1; in
acc // { "luks-data-${index}" = { keyFile = "/run/secrets/disks/data-disk-${index}"; }; }) acc // { "luks-data-${index}" = { keyFile = "/run/secrets/disks/data-disk-${index}"; }; })
{ } { }
dataDiskMounts; dataDiskMounts;
luksParityDevices = lib.lists.foldl' luksParityDevices = lib.lists.foldl'
(acc: path: let index = builtins.elemAt (lib.strings.splitString "-" path) 2; in (acc: path: let index = builtins.elemAt (lib.strings.splitString "-" path) 1; in
acc // { "luks-parity-${index}" = { keyFile = "/run/secrets/disks/parity-disk-${index}"; }; }) acc // { "luks-parity-${index}" = { keyFile = "/run/secrets/disks/parity-disk-${index}"; }; })
{ } { }
parityDiskMounts; parityDiskMounts;
+6 -4
View File
@@ -99,7 +99,7 @@ hardware_detection() {
export TARGET_GRAPHICS="false" export TARGET_GRAPHICS="false"
fi fi
echo -e "\n\n 🔎 Detecting transconding acceleration on target host..." echo -e "\n\n 🔎 Detecting transconding acceleration on target host..."
if ssh_to_host "ls /dev/dri/renderD300" 2>/dev/null; then if ssh_to_host "ls /dev/dri/renderD128" 2>/dev/null; then
echo -e " ✅ Transcoding capable card detected." echo -e " ✅ Transcoding capable card detected."
TARGET_GRAPHICS_RENDERER="true" TARGET_GRAPHICS_RENDERER="true"
else else
@@ -186,9 +186,11 @@ files_generation() {
export PARITY_DISK_3_KEY="$(openssl rand -base64 10 | tr -d '\=+/ ')" export PARITY_DISK_3_KEY="$(openssl rand -base64 10 | tr -d '\=+/ ')"
export BOOT_DISK_1_KEY="$(openssl rand -base64 10 | tr -d '\=+/ ')" export BOOT_DISK_1_KEY="$(openssl rand -base64 10 | tr -d '\=+/ ')"
export BOOT_DISK_2_KEY="$(openssl rand -base64 10 | tr -d '\=+/ ')" export BOOT_DISK_2_KEY="$(openssl rand -base64 10 | tr -d '\=+/ ')"
for i in {1..6}; do echo -n "${!DATA_DISK_${i}_KEY}" > "extra-files/run/secrets/disks/data-disk-$i"; done
for i in {1..3}; do echo -n "${!PARITY_DISK_${i}_KEY}" > "extra-files/run/secrets/disks/parity-disk-$i"; done echo -e "\n ✅ Generating disk keyfiles in extra-files/etc/secrets/disks/..."
for i in {1..2}; do echo -n "${!BOOT_DISK_${i}_KEY}" > "extra-files/run/secrets/disks/boot-disk-$i"; done for i in {1..6}; do var="DATA_DISK_${i}_KEY"; [[ -n "${!var}" ]] && echo -n "${!var}" > "extra-files/etc/secrets/disks/data-disk-$i"; done
for i in {1..3}; do var="PARITY_DISK_${i}_KEY"; [[ -n "${!var}" ]] && echo -n "${!var}" > "extra-files/etc/secrets/disks/parity-disk-$i"; done
for i in {1..2}; do var="BOOT_DISK_${i}_KEY"; [[ -n "${!var}" ]] && echo -n "${!var}" > "extra-files/etc/secrets/disks/boot-disk-$i"; done
echo "$REMOTE_PASS" | ssh_to_host """ echo "$REMOTE_PASS" | ssh_to_host """
sudo -S mkdir -p /run/secrets/disks/ sudo -S mkdir -p /run/secrets/disks/