From 35891e6481432a3fe1200d5faf1cbad63b4b169c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Numbus?= Date: Wed, 25 Feb 2026 11:22:43 +0100 Subject: [PATCH] Fixed disk lists creation. Remove unnecessary configuration. --- deploy.sh | 23 ++++++++++++----------- templates/nix-config/configuration.nix | 14 +------------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/deploy.sh b/deploy.sh index 308ad90..0ace958 100644 --- a/deploy.sh +++ b/deploy.sh @@ -359,31 +359,31 @@ disks_selection() { if [[ "${#DATA_DISKS_ID[@]}" -eq 1 ]]; then export PARITY_DISK_NUMBER=0 export CONTENT_DISK_NUMBER=1 - export PARITY_DISK_NUMBER_LIST=() - export CONTENT_DISK_NUMBER_LIST=("${#DATA_DISKS_ID[0]}") + export PARITY_DISK_LIST=() + export CONTENT_DISK_LIST=("${DATA_DISKS_ID[0]}") else export PARITY_DISK_NUMBER=$(((${#DATA_DISKS_ID[@]} + 2) / 3)) export CONTENT_DISK_NUMBER=$((${#DATA_DISKS_ID[@]} - PARITY_DISK_NUMBER)) for i in $(seq 0 $(($CONTENT_DISK_NUMBER - 1))); do - CONTENT_DISK_NUMBER_LIST+=("${#DATA_DISKS_ID[${i}]}") + CONTENT_DISK_LIST+=("${DATA_DISKS_ID[${i}]}") done for i in $(seq $CONTENT_DISK_NUMBER $((${#DATA_DISKS_ID[@]} - 1))); do - PARITY_DISK_NUMBER_LIST+=("${#DATA_DISKS_ID[${i}]}") + PARITY_DISK_LIST+=("${DATA_DISKS_ID[${i}]}") done fi if [[ "${#DATA_DISKS_ID[@]}" -gt 0 ]]; then for i in ${!DATA_DISKS_ID[@]}; do if [[ "${DATA_DISKS_TYPE[${i}]}" == "HDD" ]]; then - SPINDOWN_DISKS_ID+=("${DATA_DISKS_ID[${i}]}") + SPINDOWN_DISKS_LIST+=("${DATA_DISKS_ID[${i}]}") fi done fi - export SPINDOWN_DISKS_ID + export SPINDOWN_DISKS_LIST export BOOT_DISKS_ID_LIST - export PARITY_DISK_NUMBER_LIST - export CONTENT_DISK_NUMBER_LIST + export PARITY_DISK_LIST + export CONTENT_DISK_LIST } server_config_generation() { @@ -432,8 +432,9 @@ mail_config_generation() { disk_config_generation() { echo -e "\n # Hardware settings" >> ${CONFIGURATION_PATH} echo -e " config.numbus.hardware.bootDisksList = [ ${BOOT_DISKS_ID_LIST[@]} ];" >> ${CONFIGURATION_PATH} - echo -e " config.numbus.hardware.dataDisksList = [ ${CONTENT_DISK_NUMBER_LIST[@]} ];" >> ${CONFIGURATION_PATH} - echo -e " config.numbus.hardware.parityDisksList = [ ${PARITY_DISK_NUMBER_LIST[@]} ];" >> ${CONFIGURATION_PATH} + echo -e " config.numbus.hardware.dataDisksList = [ ${CONTENT_DISK_LIST[@]} ];" >> ${CONFIGURATION_PATH} + echo -e " config.numbus.hardware.parityDisksList = [ ${PARITY_DISK_LIST[@]} ];" >> ${CONFIGURATION_PATH} + echo -e " config.numbus.hardware.spindownDisksList = [ ${SPINDOWN_DISKS_LIST[@]} ];" >> ${CONFIGURATION_PATH} echo "}" >> ${CONFIGURATION_PATH} } @@ -618,7 +619,7 @@ export_configuration() { echo "export BOOT_DISKS_ID_LIST=\"(${BOOT_DISKS_ID_LIST[@]})\"" >> $CONFIG_EXPORT_FILE echo "export DATA_DISKS_ID=\"(${DATA_DISKS_ID[@]})\"" >> $CONFIG_EXPORT_FILE echo "export DATA_DISKS_TYPE=\"(${DATA_DISKS_TYPE[@]})\"" >> $CONFIG_EXPORT_FILE - echo "export SPINDOWN_DISKS_ID=\"(${SPINDOWN_DISKS_ID[@]})\"" >> $CONFIG_EXPORT_FILE + echo "export SPINDOWN_DISKS_LIST=\"(${SPINDOWN_DISKS_LIST[@]})\"" >> $CONFIG_EXPORT_FILE echo "export CONTENT_DISK_NUMBER=\"${CONTENT_DISK_NUMBER}\"" >> $CONFIG_EXPORT_FILE echo "export PARITY_DISK_NUMBER=\"${PARITY_DISK_NUMBER}\"" >> $CONFIG_EXPORT_FILE echo -e "\n# TPM SETTINGS" >> $CONFIG_EXPORT_FILE diff --git a/templates/nix-config/configuration.nix b/templates/nix-config/configuration.nix index b7493db..08a4129 100644 --- a/templates/nix-config/configuration.nix +++ b/templates/nix-config/configuration.nix @@ -19,16 +19,4 @@ # # TPM2 PCR check # systemIdentity.enable = true; -# systemIdentity.pcr15 = "PCR_HASH"; - - # Server - time.timeZone = "Europe/Paris"; - config.numbus.owner = "Raphael"; - - # Enable email notifications - config.numbus.mail.enable = true; - config.numbus.mail.userAddress = "user@tunea.eu"; - config.numbus.mail.adminAddress = "admin@tunea.eu"; - config.numbus.mail.smtpUsername = "raphaels.server@gmail.com"; - config.numbus.mail.smtpPasswordPath = config.sops.secrets.smtpPassword.path; - +# systemIdentity.pcr15 = "PCR_HASH"; \ No newline at end of file