diff --git a/deploy.sh b/deploy.sh index ae79098..4561f37 100644 --- a/deploy.sh +++ b/deploy.sh @@ -606,17 +606,17 @@ sum_up() { Please review the selected disk layout before proceeding. -**Boot Disks ```${#BOOT_DISKS_ID_LIST[@]}``` :** +**Boot Disks (${#BOOT_DISKS_ID_LIST[@]}) :** * **Boot 1:** \`${BOOT_DISKS_ID_LIST[0]}\` $( [[ -n "${BOOT_DISKS_ID_LIST[1]:-}" ]] && echo "* **Boot 2:** \`${BOOT_DISKS_ID_LIST[1]}\`" || echo "* **Boot 2:** *Not configured*" ) -**Data Disks ```$CONTENT_DISK_NUMBER``` :** +**Data Disks ($CONTENT_DISK_NUMBER) :** $( [[ $CONTENT_DISK_NUMBER -gt 0 ]] && j=1 && for i in $(seq 0 $(($CONTENT_DISK_NUMBER - 1))); do echo "* **Data ${j}:** \`${DATA_DISKS_ID[${i}]}\`" && j=$((j + 1)); done ) $( [[ $CONTENT_DISK_NUMBER -eq 0 ]] && echo "* *Not configured*" ) -**Parity Disks ```$PARITY_DISK_NUMBER``` :** +**Parity Disks ($PARITY_DISK_NUMBER) :** $( [[ $PARITY_DISK_NUMBER -gt 0 ]] && j=1 && for i in $(seq $CONTENT_DISK_NUMBER $((${#DATA_DISKS_ID[@]} - 1))); do echo "* **Parity ${j}:** \`${DATA_DISKS_ID[${i}]}\`" && j=$((j + 1)); done ) $( [[ $PARITY_DISK_NUMBER -eq 0 ]] && echo "* *Not configured*" ) @@ -632,15 +632,15 @@ EOF Please review the selected services before proceeding. -**DNS Service ```${#SELECTED_DNS_SERVICE[@]}``` :** +**DNS Service (${#SELECTED_DNS_SERVICE[@]}) :** $(echo "* \`${SELECTED_DNS_SERVICE[0]^}\`") -**Web Applications ```${#SELECTED_WEB_APPLICATIONS[@]}``` :** +**Web Applications (${#SELECTED_WEB_APPLICATIONS[@]}) :** $(for app in "${SELECTED_WEB_APPLICATIONS[@]}"; do echo "* \`${app^}\`"; done) -**System Services ```${#SELECTED_SYSTEM_SERVICES[@]}``` :** +**System Services (${#SELECTED_SYSTEM_SERVICES[@]}) :** $(for service in "${SELECTED_SYSTEM_SERVICES[@]}"; do echo "* \`${service^}\`"; done) @@ -655,12 +655,12 @@ EOF Please save the following secrets to a secure place (i.e. your local password manager, or a hidden sheet of paper). -**Boot Disks ```${#BOOT_DISKS_ID_LIST[@]}``` :** +**Boot Disks (${#BOOT_DISKS_ID_LIST[@]}) :** * **Disk 1 Secret Key :** \`$( cat final-nix-config/etc/secrets/disks/boot-1 )\` $( [[ -n "${BOOT_DISKS_ID_LIST[1]:-}" ]] && echo "* **Disk 2 secret key :** \`$( cat final-nix-config/etc/secrets/disks/boot-2 )\`" || echo "* **Boot 2:** *Not configured*" ) -**Data Disks ```$CONTENT_DISK_NUMBER```:** +**Data Disks ($CONTENT_DISK_NUMBER):** $( [[ $CONTENT_DISK_NUMBER -eq 0 ]] && echo "* *Not configured*" ) $( [[ $CONTENT_DISK_NUMBER -gt 0 ]] && j=1 && for i in $(seq 0 $(($CONTENT_DISK_NUMBER - 1))); do echo "* **Disk ${j} Secret Key :** \`$( cat final-nix-config/etc/secrets/disks/data-${j} )\`" && j=$((j + 1)); done )