numbus/numbus-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to get mergerFS working

Browse Source
This commit is contained in:
Raphaël Numbus
2026-01-03 19:55:19 +01:00
parent 28beb519d4
commit 379e71ca0b
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy.conf
+1 -1
View File
@@ -16,4 +16,4 @@ HOME_ROUTER_IP="192.168.1.1"
HOME_SERVER_IP="192.168.1.5" HOME_SERVER_IP="192.168.1.5"
# SERVICES SETTINGS # SERVICES SETTINGS
SELECTED_SERVICES=( "frigate" "gitea" "home-assistant" "immich" "it-tools" \ SELECTED_SERVICES=( "frigate" "gitea" "home-assistant" "immich" "it-tools" \
"nextcloud" "passbolt" "pi-hole" ) "nextcloud" "passbolt" "pi-hole" "virtualization" )
deploy.sh
+3 -3
View File
@@ -182,7 +182,7 @@ ls /dev/serial/by-id/ 2>/dev/null | grep -i "zigbee" && TARGET_ZIGBEE_DEVICE=\$(
TARGET_INTERFACE=\$(ip -4 route show default | awk '{print \$5}' | head -n1) TARGET_INTERFACE=\$(ip -4 route show default | awk '{print \$5}' | head -n1)
if ls -l /sys/class/tpm/tpm0/; then if ls -l /sys/class/tpm/tpm0/ >/dev/null 2>&1; then
TARGET_TPM="true" TARGET_TPM="true"
TARGET_TPM_VERSION=\$(cat /sys/class/tpm/tpm0/tpm_version_major) TARGET_TPM_VERSION=\$(cat /sys/class/tpm/tpm0/tpm_version_major)
else else
@@ -527,7 +527,7 @@ EOF
(envsubst < "templates/nix-config/disks/content.nix") >> final-nix-config/etc/nixos/disks/disko.nix (envsubst < "templates/nix-config/disks/content.nix") >> final-nix-config/etc/nixos/disks/disko.nix
SNAPRAID_CONTENT_FILES+=" \"/mnt/content-${j}/snapraid.content\""$'\n' SNAPRAID_CONTENT_FILES+=" \"/mnt/content-${j}/snapraid.content\""$'\n'
SNAPRAID_DATA_DISKS+=" d${j} = \"/mnt/content-${j}\";"$'\n' SNAPRAID_DATA_DISKS+=" d${j} = \"/mnt/content-${j}\";"$'\n'
MERGERFS_DEPENDS+=" \"/mnt/content-${j}\""$'\n' MERGERFS_REQ_DEPS+=" \"x-systemd.requires=/mnt/content-${j}\""$'\n'
done done
echo -e "\n✅ Generated $CONTENT_DISK_NUMBER data disk configuration(s)." echo -e "\n✅ Generated $CONTENT_DISK_NUMBER data disk configuration(s)."
j=0 j=0
@@ -542,7 +542,7 @@ EOF
export SNAPRAID_CONTENT_FILES export SNAPRAID_CONTENT_FILES
export SNAPRAID_DATA_DISKS export SNAPRAID_DATA_DISKS
export SNAPRAID_PARITY_FILES export SNAPRAID_PARITY_FILES
export MERGERFS_DEPENDS export MERGERFS_REQ_DEPS
envsubst < templates/nix-config/disks/snapraid.nix > final-nix-config/etc/nixos/disks/snapraid.nix envsubst < templates/nix-config/disks/snapraid.nix > final-nix-config/etc/nixos/disks/snapraid.nix
fi fi
# Close the disko.nix block # Close the disko.nix block
templates/nix-config/disks/content.nix
+1
View File
@@ -18,6 +18,7 @@
type = "filesystem"; type = "filesystem";
format = "xfs"; format = "xfs";
mountpoint = "/mnt/content-${j}"; mountpoint = "/mnt/content-${j}";
mountOptions = [ "noauto" "nofail" "x-systemd.automount" ];
}; };
}; };
}; };
templates/nix-config/disks/parity.nix
+1
View File
@@ -18,6 +18,7 @@
type = "filesystem"; type = "filesystem";
format = "xfs"; format = "xfs";
mountpoint = "/mnt/parity-${j}"; mountpoint = "/mnt/parity-${j}";
mountOptions = [ "noauto" "nofail" "x-systemd.automount" ];
}; };
}; };
}; };
templates/nix-config/disks/snapraid.nix
+2 -2
View File
@@ -11,6 +11,7 @@
"dropcacheonclose=true" "dropcacheonclose=true"
"defaults" "defaults"
"noauto" "noauto"
"nofail"
"allow_other" "allow_other"
"moveonenospc=1" "moveonenospc=1"
"minfreespace=50G" "minfreespace=50G"
@@ -18,8 +19,7 @@
"fsname=mergerfs_data" "fsname=mergerfs_data"
"x-mount.mkdir" "x-mount.mkdir"
"x-systemd.automount" "x-systemd.automount"
"x-systemd.requires=local-fs.target" $MERGERFS_REQ_DEPS
"x-systemd.after=network-online.target"
]; ];
}; };