diff --git a/deploy.sh b/deploy.sh index 02332a9..05083bf 100644 --- a/deploy.sh +++ b/deploy.sh @@ -714,36 +714,11 @@ EOF ### Keys recap <-- } -export_configuration() { - cp deploy.conf final-nix-config/etc/numbus-server/numbus-server.conf - - local CONFIG_EXPORT_DIR="final-nix-config/etc/numbus-server/" - local CONFIG_EXPORT_FILE="${CONFIG_EXPORT_DIR}/numbus-server.conf" - - cp -avu templates/post-install/numbus-server.sh "$CONFIG_EXPORT_DIR" - - echo "export TARGET_INTERFACE=\"${TARGET_INTERFACE}\"" >> $CONFIG_EXPORT_FILE - echo -e "\n# SERVER SETTINGS" >> $CONFIG_EXPORT_FILE - echo "export SERVER_OWNER_NAME=\"${SERVER_OWNER_NAME:-User}\"" >> $CONFIG_EXPORT_FILE - echo -e "\n# DISK SETTINGS" >> $CONFIG_EXPORT_FILE - echo "export BOOT_DISKS_ID=\"(${BOOT_DISKS_ID[@]})\"" >> $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 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 - echo "export TARGET_TPM=\"${TARGET_TPM}\"" >> $CONFIG_EXPORT_FILE - echo "export TARGET_TPM_VERSION=\"${TARGET_TPM_VERSION:-}\"" >> $CONFIG_EXPORT_FILE - echo -e "\n# Podman SETTINGS" >> $CONFIG_EXPORT_FILE - echo "export PODMAN_NETWORKS=\"${PODMAN_NETWORKS}\"" >> $CONFIG_EXPORT_FILE - echo "export TRAEFIK_NETWORKS=\"${TRAEFIK_NETWORKS}\"" >> $CONFIG_EXPORT_FILE - echo "export TRAEFIK_REF_NETWORKS=\"${TRAEFIK_REF_NETWORKS}\"" >> $CONFIG_EXPORT_FILE -} - cloudflare_dns_setup() { - local ZONE_ID && local RECORD_COUNT && local IS_MATCHING - local DNS_RECORDS && local CREATION_STATUS + local ZONE_ID + local RECORD_COUNT + local IS_MATCHING + local DNS_RECORDS create_records() { local SUBDOMAIN="${1}" @@ -822,6 +797,33 @@ cloudflare_dns_setup() { done } +export_configuration() { + cp deploy.conf final-nix-config/etc/numbus-server/numbus-server.conf + + local CONFIG_EXPORT_DIR="final-nix-config/etc/numbus-server/" + local CONFIG_EXPORT_FILE="${CONFIG_EXPORT_DIR}/numbus-server.conf" + + cp -avu templates/post-install/numbus-server.sh "$CONFIG_EXPORT_DIR" + + echo "export TARGET_INTERFACE=\"${TARGET_INTERFACE}\"" >> $CONFIG_EXPORT_FILE + echo -e "\n# SERVER SETTINGS" >> $CONFIG_EXPORT_FILE + echo "export SERVER_OWNER_NAME=\"${SERVER_OWNER_NAME:-User}\"" >> $CONFIG_EXPORT_FILE + echo -e "\n# DISK SETTINGS" >> $CONFIG_EXPORT_FILE + echo "export BOOT_DISKS_ID=\"(${BOOT_DISKS_ID[@]})\"" >> $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 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 + echo "export TARGET_TPM=\"${TARGET_TPM}\"" >> $CONFIG_EXPORT_FILE + echo "export TARGET_TPM_VERSION=\"${TARGET_TPM_VERSION:-}\"" >> $CONFIG_EXPORT_FILE + echo -e "\n# Podman SETTINGS" >> $CONFIG_EXPORT_FILE + echo "export PODMAN_NETWORKS=\"${PODMAN_NETWORKS}\"" >> $CONFIG_EXPORT_FILE + echo "export TRAEFIK_NETWORKS=\"${TRAEFIK_NETWORKS}\"" >> $CONFIG_EXPORT_FILE + echo "export TRAEFIK_REF_NETWORKS=\"${TRAEFIK_REF_NETWORKS}\"" >> $CONFIG_EXPORT_FILE +} + deploy() { git -C "/home/nixosd/numbus-server" add -f "final-nix-config"