From 6eb7673ca68c3f18c7be2c193496d2d3017694e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Billet?= Date: Wed, 26 Nov 2025 22:33:06 +0100 Subject: [PATCH] Fixed dashes error. --- config-files/sops-nix/secrets.yaml | 20 +++++++++--------- deploy.sh | 34 +++++++++++++++--------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/config-files/sops-nix/secrets.yaml b/config-files/sops-nix/secrets.yaml index 0d485a4..90205d9 100644 --- a/config-files/sops-nix/secrets.yaml +++ b/config-files/sops-nix/secrets.yaml @@ -1,4 +1,4 @@ -ssh-public-keys: $SSH_PUBLIC_KEY +ssh_public_keys: $SSH_PUBLIC_KEY docker: nextcloud: | @@ -34,12 +34,12 @@ docker: HOME_SERVER_IP=$HOME_SERVER_IP FTLCONF_webserver_api_password=$FTLCONF_WEBSERVER_PASSWORD disks: - data-disk-1=$DATA-DISK-1 - data-disk-2=$DATA-DISK-2 - data-disk-3=$DATA-DISK-3 - data-disk-4=$DATA-DISK-4 - data-disk-5=$DATA-DISK-5 - data-disk-6=$DATA-DISK-6 - parity-disk-1=$PARITY-DISK-1 - parity-disk-2=$PARITY-DISK-2 - parity-disk-3=$PARITY-DISK-3 + data_disk_1=$DATA_DISK_1 + data_disk_2=$DATA_DISK_2 + data_disk_3=$DATA_DISK_3 + data_disk_4=$DATA_DISK_4 + data_disk_5=$DATA_DISK_5 + data_disk_6=$DATA_DISK_6 + parity_disk_1=$PARITY_DISK_1 + parity_disk_2=$PARITY_DISK_2 + parity_disk_3=$PARITY_DISK_3 diff --git a/deploy.sh b/deploy.sh index 017159a..630dc3b 100755 --- a/deploy.sh +++ b/deploy.sh @@ -109,7 +109,7 @@ hardware_detection() { TARGET_GRAPHICS="false" fi echo -e "\n\n 🔎 Detecting transconding acceleration on target host..." - if ssh_to_host "ls /dev/dri/renderD128" 2>/dev/null; then + if ssh_to_host "ls /dev/dri/renderD300" 2>/dev/null; then echo -e " ✅ Transcoding capable card detected." TARGET_GRAPHICS_RENDERER="true" else @@ -174,21 +174,21 @@ files_generation() { envsubst < config-files/sops-nix/.sops.yaml > extra-files/etc/nixos/.sops.yaml echo -e "\n\n ✅ Generating secure random database passwords..." - HOME_ASSISTANT_MQTT_USER="$(openssl rand -base64 29 | tr -d "123456789=+/" | cut -c1-10)" - HOME_ASSISTANT_MQTT_PASSWORD="$(openssl rand -base64 29 | tr -d "=+/" | cut -c1-64)" - PASSBOLT_MYSQL_DATABASE="$(openssl rand -base64 29 | tr -d "123456789=+/" | cut -c1-10)" - PASSBOLT_MYSQL_USER="$(openssl rand -base64 29 | tr -d "123456789=+/" | cut -c1-10)" - PASSBOLT_MYSQL_PASSWORD="$(openssl rand -base64 29 | tr -d "=+/" | cut -c1-64)" - FTLCONF_WEBSERVER_PASSWORD="$(openssl rand -base64 29 | tr -d "=+/" | cut -c1-64)" - DATA-DISK-1="$(openssl rand -base64 128 | tr -d "=+/" | cut -c1-128)" - DATA-DISK-2="$(openssl rand -base64 128 | tr -d "=+/" | cut -c1-128)" - DATA-DISK-3="$(openssl rand -base64 128 | tr -d "=+/" | cut -c1-128)" - DATA-DISK-4="$(openssl rand -base64 128 | tr -d "=+/" | cut -c1-128)" - DATA-DISK-5="$(openssl rand -base64 128 | tr -d "=+/" | cut -c1-128)" - DATA-DISK-6="$(openssl rand -base64 128 | tr -d "=+/" | cut -c1-128)" - PARITY-DISK-1="$(openssl rand -base64 128 | tr -d "=+/" | cut -c1-128)" - PARITY-DISK-2="$(openssl rand -base64 128 | tr -d "=+/" | cut -c1-128)" - PARITY-DISK-3="$(openssl rand -base64 128 | tr -d "=+/" | cut -c1-128)" + HOME_ASSISTANT_MQTT_USER=$(openssl rand -base64 29 | tr -d "\123456789=+/" | cut -c1-10) + HOME_ASSISTANT_MQTT_PASSWORD=$(openssl rand -base64 29 | tr -d "\=+/" | cut -c1-64) + PASSBOLT_MYSQL_DATABASE=$(openssl rand -base64 29 | tr -d "\123456789=+/" | cut -c1-10) + PASSBOLT_MYSQL_USER=$(openssl rand -base64 29 | tr -d "\123456789=+/" | cut -c1-10) + PASSBOLT_MYSQL_PASSWORD=$(openssl rand -base64 29 | tr -d "\=+/" | cut -c1-64) + FTLCONF_WEBSERVER_PASSWORD=$(openssl rand -base64 29 | tr -d "\=+/" | cut -c1-64) + DATA_DISK_1=$(openssl rand -base64 300 | tr -d "\=+/" | cut -c1-300) + DATA_DISK_2=$(openssl rand -base64 300 | tr -d "\=+/" | cut -c1-300) + DATA_DISK_3=$(openssl rand -base64 300 | tr -d "\=+/" | cut -c1-300) + DATA_DISK_4=$(openssl rand -base64 300 | tr -d "\=+/" | cut -c1-300) + DATA_DISK_5=$(openssl rand -base64 300 | tr -d "\=+/" | cut -c1-300) + DATA_DISK_6=$(openssl rand -base64 300 | tr -d "\=+/" | cut -c1-300) + PARITY_DISK_1=$(openssl rand -base64 300 | tr -d "\=+/" | cut -c1-300) + PARITY_DISK_2=$(openssl rand -base64 300 | tr -d "\=+/" | cut -c1-300) + PARITY_DISK_3=$(openssl rand -base64 300 | tr -d "\=+/" | cut -c1-300) echo -e "\n\n ✅ Encrypting secrets in the correct file..." envsubst < "config-files/sops-nix/secrets.yaml" | sops encrypt --filename-override secrets.yaml \ @@ -203,7 +203,7 @@ files_generation() { echo -e "\n\n ✅ Adapting the docker configuration to your hardware..." DEVICES_BLOCK="" if [[ "$TARGET_GRAPHICS_RENDERER" == "true" ]]; then - DEVICES_BLOCK+=" - /dev/dri/renderD128:/dev/dri/renderD128\n" + DEVICES_BLOCK+=" - /dev/dri/renderD300:/dev/dri/renderD300\n" fi if [[ "$TARGET_USB_CORAL" == "true" ]]; then DEVICES_BLOCK+=" - /dev/bus/usb:/dev/bus/usb\n"