From 0946cc7b085f95221140c0fe2f6d6b5097db103e Mon Sep 17 00:00:00 2001 From: Raphael Numbus Date: Sat, 6 Dec 2025 19:46:43 +0100 Subject: [PATCH] TEST --- configuration.nix | 4 ++-- deploy.sh | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/configuration.nix b/configuration.nix index aa4a629..5bc4c73 100644 --- a/configuration.nix +++ b/configuration.nix @@ -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. # and that the LUKS devices are named luks-data-1, luks-parity-1, etc. in disk-config.nix. 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}"; }; }) { } dataDiskMounts; 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}"; }; }) { } parityDiskMounts; diff --git a/deploy.sh b/deploy.sh index 84dead3..7925265 100644 --- a/deploy.sh +++ b/deploy.sh @@ -99,7 +99,7 @@ hardware_detection() { export TARGET_GRAPHICS="false" fi 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." TARGET_GRAPHICS_RENDERER="true" else @@ -186,9 +186,11 @@ files_generation() { 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_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 - for i in {1..2}; do echo -n "${!BOOT_DISK_${i}_KEY}" > "extra-files/run/secrets/disks/boot-disk-$i"; done + + echo -e "\n ✅ Generating disk keyfiles in extra-files/etc/secrets/disks/..." + 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 """ sudo -S mkdir -p /run/secrets/disks/