Huge script change. Reformatting of the disk_config_configuration function.

This commit is contained in:
Raphaël Billet
2025-12-11 08:50:37 +01:00
parent 1f8c6c50d7
commit 0e0ed4d3a3
9 changed files with 138 additions and 183 deletions
+1 -1
View File
@@ -23,7 +23,7 @@
# Boot disk
"system-1" = {
type = "disk";
device = "${BOOT_DISK_1}";
device = "${BOOT_DISK_1_ID}";
content = {
type = "gpt";
partitions = {
+2 -2
View File
@@ -4,7 +4,7 @@
disk = {
"system-1" = {
type = "disk";
device = "${BOOT_DISK_1}";
device = "${BOOT_DISK_1_ID}";
content = {
type = "gpt";
partitions = {
@@ -34,7 +34,7 @@
};
"system-2" = {
type = "disk";
device = "${BOOT_DISK_2}";
device = "${BOOT_DISK_2_ID}";
content = {
type = "gpt";
partitions = {
+5 -5
View File
@@ -1,6 +1,6 @@
"content-${DISK_NUMBER}" = {
"content-${i}" = {
type = "disk";
device = "${DISK_PATH}";
device = "${CONTENT_DISK_ID}";
content = {
type = "gpt";
partitions = {
@@ -8,12 +8,12 @@
size = "100%";
content = {
type = "luks";
name = "crypted-content-${DISK_NUMBER}";
settings.keyFile = "/etc/secrets/disks/content-disk-${DISK_NUMBER}";
name = "crypted-content-${i}";
settings.keyFile = "/etc/secrets/disks/content-disk-${i}";
content = {
type = "filesystem";
format = "xfs";
mountpoint = "/mnt/content-${DISK_NUMBER}";
mountpoint = "/mnt/content-${i}";
};
};
};
+3 -3
View File
@@ -1,9 +1,9 @@
};
# Data mirror configuration generated by deploy.sh
disk = {
"content-1" = {
type = "disk";
device = "${CONTENT_DISK_1}";
device = "${CONTENT_DISK_1_ID}";
content = {
type = "gpt";
partitions = {
@@ -20,7 +20,7 @@
};
"parity-1" = {
type = "disk";
device = "${PARITY_DISK_1}";
device = "${PARITY_DISK_1_ID}";
content = {
type = "gpt";
partitions = {
+5 -5
View File
@@ -1,6 +1,6 @@
"parity-${DISK_NUMBER}" = {
"parity-${i}" = {
type = "disk";
device = "${DISK_PATH}";
device = "${PARITY_DISK_ID}";
content = {
type = "gpt";
partitions = {
@@ -8,12 +8,12 @@
size = "100%";
content = {
type = "luks";
name = "crypted-parity-${DISK_NUMBER}";
settings.keyFile = "/etc/secrets/disks/parity-disk-${DISK_NUMBER}";
name = "crypted-parity-${i}";
settings.keyFile = "/etc/secrets/disks/parity-disk-${i}";
content = {
type = "filesystem";
format = "xfs";
mountpoint = "/mnt/parity-${DISK_NUMBER}";
mountpoint = "/mnt/parity-${i}";
};
};
};