diff --git a/deploy.sh b/deploy.sh index c79aa08..19e9750 100644 --- a/deploy.sh +++ b/deploy.sh @@ -248,6 +248,8 @@ services_selection() { SELECTED_SERVICES+=(${AVAILABLE_SERVICES[$i]}) fi done + + export SELECTED_SERVICES } disks_selection() { @@ -374,12 +376,12 @@ services_generation() { if [[ "${service}" != "virtualization" ]]; then j=$((j + 1)) cp templates/nix-config/podman/${service}.nix final-nix-config/etc/nixos/podman/${service}.nix - PODMAN_NETWORKS+=" \${pkgs.podman}/bin/podman network create --driver=bridge --subnet=172.16.${j}.0/24 --ip-range=172.16.${j}.0/24 --gateway=172.16.${j}.254 ${service}_backend" - PODMAN_NETWORKS+=" \${pkgs.podman}/bin/podman network create --driver=bridge --subnet=172.16.${j}0.0/24 --ip-range=172.16.${j}0.0/24 --gateway=172.16.${j}0.254 ${service}_frontend" - TRAEFIK_NETWORKS+=" ${service}_frontend:" - TRAEFIK_NETWORKS+=" ipv4_address: 172.16.${j}0.253" - TRAEFIK_NETWORKS_REF+=" ${service}_frontend:" - TRAEFIK_NETWORKS_REF+=" external: true" + PODMAN_NETWORKS+=" \${pkgs.podman}/bin/podman network create --driver=bridge --subnet=172.16.${j}.0/24 --ip-range=172.16.${j}.0/24 --gateway=172.16.${j}.254 ${service}_backend"$'\n' + PODMAN_NETWORKS+=" \${pkgs.podman}/bin/podman network create --driver=bridge --subnet=172.16.${j}0.0/24 --ip-range=172.16.${j}0.0/24 --gateway=172.16.${j}0.254 ${service}_frontend"$'\n' + TRAEFIK_NETWORKS+=" ${service}_frontend:"$'\n' + TRAEFIK_NETWORKS+=" ipv4_address: 172.16.${j}0.253"$'\n' + TRAEFIK_NETWORKS_REF+=" ${service}_frontend:"$'\n' + TRAEFIK_NETWORKS_REF+=" external: true"$'\n' fi if [[ "${service}" == "frigate" ]]; then local FRIGATE_DEVICES_BLOCK="" @@ -820,7 +822,6 @@ elif [[ "$ACTION_ANSWER" == "[2] 💽 Deploy NixOS on a remote machine with a fi necessary_information_config setup_ssh hardware_detection - services_selection disks_selection folder_tree_generation services_generation