From 51f052219308e3036fc7dc1bf640eb73bba3ddfc Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Sun, 17 May 2026 17:39:47 -0400
Subject: [PATCH] undo

---
 backend/config/__init__.py | 2 +-
 backend/pytest.ini         | 1 -
 docker/Dockerfile          | 8 ++++----
 docker/init_scripts/init   | 2 +-
 entrypoint.sh              | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/backend/config/__init__.py b/backend/config/__init__.py
index 012594e6a..f171ba5aa 100644
--- a/backend/config/__init__.py
+++ b/backend/config/__init__.py
@@ -213,7 +213,7 @@ SCHEDULED_RETROACHIEVEMENTS_PROGRESS_SYNC_CRON: Final[str] = _get_env(
 )
 
 # SYNC
-SYNC_BASE_PATH: Final[str] = _get_env("SYNC_BASE_PATH", "/var/lib/romm/sync")
+SYNC_BASE_PATH: Final[str] = _get_env("SYNC_BASE_PATH", f"{ROMM_BASE_PATH}/sync")
 ENABLE_SYNC_FOLDER_WATCHER: Final[bool] = safe_str_to_bool(
     _get_env("ENABLE_SYNC_FOLDER_WATCHER")
 )
diff --git a/backend/pytest.ini b/backend/pytest.ini
index b2f4d0ce8..2dc6f5b34 100644
--- a/backend/pytest.ini
+++ b/backend/pytest.ini
@@ -4,7 +4,6 @@ asyncio_default_fixture_loop_scope = function
 testpaths = tests
 env =
    ROMM_BASE_PATH=romm_test
-   SYNC_BASE_PATH=romm_test/sync
    DB_HOST=127.0.0.1
    DB_NAME=romm_test
    DB_USER=romm_test
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 182d1c036..1571e0a46 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -197,9 +197,9 @@ COPY ./docker/gunicorn/logging.conf /etc/gunicorn/logging.conf
 # - Create base directories and make default user/group the owner.
 # - Make nginx configuration files writable by everyone for `envsubst` to work
 RUN addgroup -g 1000 -S romm && adduser -u 1000 -D -S -G romm romm && \
-    mkdir -p /romm /redis-data /var/lib/romm/sync && \
-    chown romm:romm /romm /redis-data /var/lib/romm /var/lib/romm/sync && \
-    chmod 755 /romm /redis-data /var/lib/romm /var/lib/romm/sync && \
+    mkdir /romm /redis-data && \
+    chown romm:romm /romm /redis-data && \
+    chmod 755 /romm /redis-data && \
     chmod -R a+w /etc/nginx/conf.d
 
 
@@ -218,7 +218,7 @@ ENV PYTHONUNBUFFERED=1
 ENV PYTHONPATH=/backend
 
 # Declare the supported volumes
-VOLUME ["/romm/resources", "/romm/library", "/romm/assets", "/romm/config", "/var/lib/romm/sync", "/redis-data"]
+VOLUME ["/romm/resources", "/romm/library", "/romm/assets", "/romm/config", "/romm/sync", "/redis-data"]
 
 # Expose non-privileged ports
 EXPOSE 8080 6379/tcp
diff --git a/docker/init_scripts/init b/docker/init_scripts/init
index c9bee42ea..66500723b 100755
--- a/docker/init_scripts/init
+++ b/docker/init_scripts/init
@@ -248,7 +248,7 @@ start_bin_watcher() {
 
 start_bin_sync_watcher() {
 	info_log "Starting sync folder watcher"
-	export SYNC_BASE_PATH="${SYNC_BASE_PATH:-/var/lib/romm/sync}"
+	export SYNC_BASE_PATH="${SYNC_BASE_PATH:-${ROMM_BASE_PATH:-/romm}/sync}"
 	mkdir -p "${SYNC_BASE_PATH}"
 	if [[ ${OTEL_SDK_DISABLED:-false} == "true" ]]; then
 		watchfiles \
diff --git a/entrypoint.sh b/entrypoint.sh
index eaacebd1e..d4cdf6c8a 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -80,7 +80,7 @@ watchfiles \
 
 if [[ ${ENABLE_SYNC_FOLDER_WATCHER:-false} == "true" ]]; then
 	echo "Starting sync folder watcher..."
-	export SYNC_BASE_PATH="${SYNC_BASE_PATH:-/var/lib/romm/sync}"
+	export SYNC_BASE_PATH="${SYNC_BASE_PATH:-${ROMM_BASE_PATH:-/romm}/sync}"
 	mkdir -p "${SYNC_BASE_PATH}"
 	watchfiles \
 		--target-type command \