numbus/numbus-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed boot initrd options

Browse Source
This commit is contained in:
Raphaël Numbus
2026-01-02 20:04:59 +01:00
parent 6ed4557cd8
commit b997cb6bf5
2 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy.sh
+3 -23
View File
@@ -492,21 +492,12 @@ EOF
cp -avu templates/nix-config/disks/snapraid.nix final-nix-config/etc/nixos/disks/ cp -avu templates/nix-config/disks/snapraid.nix final-nix-config/etc/nixos/disks/
cp -avu templates/nix-config/disks/pcr-check.nix final-nix-config/etc/nixos/disks/ cp -avu templates/nix-config/disks/pcr-check.nix final-nix-config/etc/nixos/disks/
sed -i "s|# ./disks/snapraid.nix| ./disks/snapraid.nix|" final-nix-config/etc/nixos/configuration.nix sed -i "s|# ./disks/snapraid.nix| ./disks/snapraid.nix|" final-nix-config/etc/nixos/configuration.nix
sed -i '$ d' final-nix-config/etc/nixos/disks/snapraid.nix
cat << EOF >> final-nix-config/etc/nixos/disks/snapraid.nix
# --> Automatic data disks unlock, generated by deploy.sh on $(date)
boot.initrd.luks.devices = {
EOF EOF
j=0 j=0
for i in $(seq 0 $(($CONTENT_DISK_NUMBER - 1))); do for i in $(seq 0 $(($CONTENT_DISK_NUMBER - 1))); do
export j=$((j + 1)) export j=$((j + 1))
export CONTENT_DISK_ID="${DATA_DISKS_ID[${i}]}" export CONTENT_DISK_ID="${DATA_DISKS_ID[${i}]}"
(envsubst < "templates/nix-config/disks/content.nix") >> final-nix-config/etc/nixos/disks/disko.nix (envsubst < "templates/nix-config/disks/content.nix") >> final-nix-config/etc/nixos/disks/disko.nix
cat << EOF >> final-nix-config/etc/nixos/disks/snapraid.nix
"crypted-content-disk-${j}" = {
device = "${CONTENT_DISK_ID}";
keyFile = "/etc/secrets/disks/content-disk-${j}";
};
EOF EOF
done done
echo -e "\n✅ Generated $CONTENT_DISK_NUMBER data disk configuration(s)." echo -e "\n✅ Generated $CONTENT_DISK_NUMBER data disk configuration(s)."
@@ -515,20 +506,9 @@ EOF
export j=$((j + 1)) export j=$((j + 1))
export PARITY_DISK_ID="${DATA_DISKS_ID[${i}]}" export PARITY_DISK_ID="${DATA_DISKS_ID[${i}]}"
(envsubst < "templates/nix-config/disks/parity.nix") >> final-nix-config/etc/nixos/disks/disko.nix (envsubst < "templates/nix-config/disks/parity.nix") >> final-nix-config/etc/nixos/disks/disko.nix
cat << EOF >> final-nix-config/etc/nixos/disks/snapraid.nix
"crypted-parity-disk-${j}" = {
device = "${PARITY_DISK_ID}";
keyFile = "/etc/secrets/disks/parity-disk-${j}}";
};
EOF EOF
done done
echo -e "\n✅ Generated $PARITY_DISK_NUMBER parity disk configuration(s)." echo -e "\n✅ Generated $PARITY_DISK_NUMBER parity disk configuration(s)."
# Close the snapraid.nix block
cat <<'EOF' >> final-nix-config/etc/nixos/disks/snapraid.nix
# Automatic data disks unlock <--
};
}
EOF
fi fi
# Close the disko.nix block # Close the disko.nix block
cat <<'EOF' >> final-nix-config/etc/nixos/disks/disko.nix cat <<'EOF' >> final-nix-config/etc/nixos/disks/disko.nix
@@ -564,7 +544,7 @@ EOF
chmod 600 "final-nix-config/etc/secrets/disks/boot-disk-${i}" chmod 600 "final-nix-config/etc/secrets/disks/boot-disk-${i}"
ssh_to_host 'bash -s' << EOF ssh_to_host 'bash -s' << EOF
echo "$REMOTE_PASS" | sudo -S mkdir -p /etc/secrets/disks/ echo "$REMOTE_PASS" | sudo -S mkdir -p /etc/secrets/disks/
echo "$REMOTE_PASS" | sudo -S bash -c "printf '%s' '$PASS' > /etc/secrets/disks/boot-disk-${i}" echo "$REMOTE_PASS" | sudo -S bash -c "echo '$PASS' > /etc/secrets/disks/boot-disk-${i}"
EOF EOF
done done
for i in $(seq 1 "$CONTENT_DISK_NUMBER"); do for i in $(seq 1 "$CONTENT_DISK_NUMBER"); do
@@ -572,7 +552,7 @@ EOF
echo -n "$PASS" > "final-nix-config/etc/secrets/disks/content-disk-${i}" echo -n "$PASS" > "final-nix-config/etc/secrets/disks/content-disk-${i}"
chmod 600 "final-nix-config/etc/secrets/disks/content-disk-${i}" chmod 600 "final-nix-config/etc/secrets/disks/content-disk-${i}"
ssh_to_host 'bash -s' << EOF ssh_to_host 'bash -s' << EOF
echo "$REMOTE_PASS" | sudo -S bash -c "printf '%s' '$PASS' > /etc/secrets/disks/content-disk-${i}" echo "$REMOTE_PASS" | sudo -S bash -c "echo '$PASS' > /etc/secrets/disks/content-disk-${i}"
EOF EOF
done done
for i in $(seq 1 "$PARITY_DISK_NUMBER"); do for i in $(seq 1 "$PARITY_DISK_NUMBER"); do
@@ -580,7 +560,7 @@ EOF
echo -n "$PASS" > "final-nix-config/etc/secrets/disks/parity-disk-${i}" echo -n "$PASS" > "final-nix-config/etc/secrets/disks/parity-disk-${i}"
chmod 600 "final-nix-config/etc/secrets/disks/parity-disk-${i}" chmod 600 "final-nix-config/etc/secrets/disks/parity-disk-${i}"
ssh_to_host 'bash -s' << EOF ssh_to_host 'bash -s' << EOF
echo "$REMOTE_PASS" | sudo -S bash -c "printf '%s' '$PASS' > /etc/secrets/disks/parity-disk-${i}" echo "$REMOTE_PASS" | sudo -S bash -c "echo '$PASS' > /etc/secrets/disks/parity-disk-${i}"
EOF EOF
done done
templates/nix-config/disks/snapraid.nix
-1
View File
@@ -40,5 +40,4 @@ in
dataDisks = builtins.removeAttrs snapraidDataDisks [ "i" ]; dataDisks = builtins.removeAttrs snapraidDataDisks [ "i" ];
}; };
### SnapRAID setup <-- ### SnapRAID setup <--
} }