From adcb1552104dee8d50a03b43657279c91dd36823 Mon Sep 17 00:00:00 2001
From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com>
Date: Wed, 25 Mar 2026 08:46:01 +0100
Subject: [PATCH] Expose Matter Server data at /data; fix scripts

Create a /data symlink to /opt/matter-server/data (remove existing symlink if present) and update the matter-server systemd ExecStart to use /data and /data/credentials so storage can be mounted externally. Also clean up step-ca install script formatting: fix sed -i spacing, collapse the while loop header, and normalize indentation for whiptail and step-ca command lines (no functional behavior changes).
---
 install/matter-server-install.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/install/matter-server-install.sh b/install/matter-server-install.sh
index 9caffafa..f0b69356 100644
--- a/install/matter-server-install.sh
+++ b/install/matter-server-install.sh
@@ -27,6 +27,12 @@ UV_PYTHON="3.12" setup_uv
 
 msg_info "Setting up Matter Server"
 mkdir -p /opt/matter-server/data/credentials
+if [ -L /data ]; then
+  rm -f /data
+fi
+if [ ! -e /data ]; then
+  ln -s /opt/matter-server/data /data
+fi
 $STD uv venv /opt/matter-server/.venv
 MATTER_VERSION=$(get_latest_github_release "matter-js/python-matter-server")
 $STD uv pip install --python /opt/matter-server/.venv/bin/python "python-matter-server[server]==${MATTER_VERSION}"
@@ -51,7 +57,7 @@ After=network.target
 [Service]
 Type=simple
 User=root
-ExecStart=/opt/matter-server/.venv/bin/matter-server --storage-path /opt/matter-server/data --paa-root-cert-dir /opt/matter-server/data/credentials
+ExecStart=/opt/matter-server/.venv/bin/matter-server --storage-path /data --paa-root-cert-dir /data/credentials
 Restart=on-failure
 RestartSec=5