From 9fed5d14c3f33e030c493981615c325288324ef9 Mon Sep 17 00:00:00 2001 From: SHU-red <68030498+SHU-red@users.noreply.github.com> Date: Tue, 6 Jan 2026 12:20:55 +0100 Subject: [PATCH 1/7] Update volume paths and port mappings in docker-compose Make syncserver-port and mount-volume paths optionally be configurable through env vars --- docker-compose.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 9abdd78..414cb50 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,8 +3,9 @@ services: container_name: firefox_mariadb image: linuxserver/mariadb:10.6.13 volumes: - - ./data/config:/config - - ./data/initdb.d/init.sql:/config/initdb.d/init.sql + # Optional volume path for MariaDB config/data + - ${MARIADB_DATA_PATH:-./data/config}:/config + - ${MARIADB_INIT_PATH:-./data/initdb.d/init.sql}:/config/initdb.d/init.sql restart: unless-stopped environment: MYSQL_DATABASE: syncstorage @@ -17,14 +18,16 @@ services: build: ./app/ restart: unless-stopped ports: - - "8000:8000" + # Optional outbound (host) port mapping + - "${SYNCSERVER_HOST_PORT:-8000}:8000" depends_on: - mariadb environment: LOGLEVEL: info SYNC_URL: ${SYNC_URL} - SYNC_CAPACITY: 10 # Max number of users that will be accepted + SYNC_CAPACITY: 10 SYNC_MASTER_SECRET: ${SYNC_MASTER_SECRET} METRICS_HASH_SECRET: ${METRICS_HASH_SECRET} + # Update these to match the SYNC_URL if the port changes SYNC_SYNCSTORAGE_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/syncstorage_rs SYNC_TOKENSERVER_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/tokenserver_rs From e64d358dfa13d755cb9c32e0228645682f1d5d63 Mon Sep 17 00:00:00 2001 From: SHU-red <68030498+SHU-red@users.noreply.github.com> Date: Tue, 6 Jan 2026 15:42:22 +0100 Subject: [PATCH 2/7] Update MariaDB and SyncServer configurations --- docker-compose.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 414cb50..9ee85fe 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,12 +3,11 @@ services: container_name: firefox_mariadb image: linuxserver/mariadb:10.6.13 volumes: - # Optional volume path for MariaDB config/data - ${MARIADB_DATA_PATH:-./data/config}:/config - ${MARIADB_INIT_PATH:-./data/initdb.d/init.sql}:/config/initdb.d/init.sql restart: unless-stopped environment: - MYSQL_DATABASE: syncstorage + MYSQL_DATABASE: syncstorage_rs MYSQL_USER: sync MYSQL_PASSWORD: ${MYSQL_PASSWORD} MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} @@ -18,16 +17,15 @@ services: build: ./app/ restart: unless-stopped ports: - # Optional outbound (host) port mapping - - "${SYNCSERVER_HOST_PORT:-8000}:8000" + - "${SYNCSERVER_HOST_PORT:-5300}:8000" depends_on: - mariadb environment: - LOGLEVEL: info - SYNC_URL: ${SYNC_URL} + RUST_LOG: info + RUST_BACKTRACE: 1 + SYNC_URL: ${SYNC_URL:-http://192.168.178.57:5300} SYNC_CAPACITY: 10 SYNC_MASTER_SECRET: ${SYNC_MASTER_SECRET} METRICS_HASH_SECRET: ${METRICS_HASH_SECRET} - # Update these to match the SYNC_URL if the port changes SYNC_SYNCSTORAGE_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/syncstorage_rs - SYNC_TOKENSERVER_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/tokenserver_rs + SYNC_TOKENSERVER_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/syncstorage_rs From 37c4a328c4fffa1bc2859b1fde2a541571f6a668 Mon Sep 17 00:00:00 2001 From: SHU-red <68030498+SHU-red@users.noreply.github.com> Date: Tue, 6 Jan 2026 15:45:13 +0100 Subject: [PATCH 3/7] Add ssl-mode=disabled to database URLs --- docker-compose.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 9ee85fe..692dac3 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -20,12 +20,12 @@ services: - "${SYNCSERVER_HOST_PORT:-5300}:8000" depends_on: - mariadb - environment: + environment: RUST_LOG: info RUST_BACKTRACE: 1 SYNC_URL: ${SYNC_URL:-http://192.168.178.57:5300} SYNC_CAPACITY: 10 SYNC_MASTER_SECRET: ${SYNC_MASTER_SECRET} METRICS_HASH_SECRET: ${METRICS_HASH_SECRET} - SYNC_SYNCSTORAGE_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/syncstorage_rs - SYNC_TOKENSERVER_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/syncstorage_rs + SYNC_SYNCSTORAGE_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/syncstorage_rs?ssl-mode=disabled + SYNC_TOKENSERVER_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/syncstorage_rs?ssl-mode=disabled From 3c1726785efd83ee8c34e9bdafc8a50dee4a3f17 Mon Sep 17 00:00:00 2001 From: SHU-red <68030498+SHU-red@users.noreply.github.com> Date: Tue, 6 Jan 2026 15:48:18 +0100 Subject: [PATCH 4/7] Update environment variables in docker-compose.yaml --- docker-compose.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 692dac3..b631268 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -21,11 +21,10 @@ services: depends_on: - mariadb environment: - RUST_LOG: info - RUST_BACKTRACE: 1 - SYNC_URL: ${SYNC_URL:-http://192.168.178.57:5300} - SYNC_CAPACITY: 10 + LOGLEVEL: info + SYNC_URL: ${SYNC_URL} + SYNC_CAPACITY: 10 # Max number of users that will be accepted SYNC_MASTER_SECRET: ${SYNC_MASTER_SECRET} METRICS_HASH_SECRET: ${METRICS_HASH_SECRET} SYNC_SYNCSTORAGE_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/syncstorage_rs?ssl-mode=disabled - SYNC_TOKENSERVER_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/syncstorage_rs?ssl-mode=disabled + SYNC_TOKENSERVER_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/tokenserver_rs?ssl-mode=disabled From ce912af6d2c80e9ad98dfd9e7b7f5c97e7596839 Mon Sep 17 00:00:00 2001 From: SHU-red <68030498+SHU-red@users.noreply.github.com> Date: Tue, 6 Jan 2026 15:51:34 +0100 Subject: [PATCH 5/7] Fix indentation for environment variable section --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index b631268..071f1e8 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -20,7 +20,7 @@ services: - "${SYNCSERVER_HOST_PORT:-5300}:8000" depends_on: - mariadb - environment: + environment: LOGLEVEL: info SYNC_URL: ${SYNC_URL} SYNC_CAPACITY: 10 # Max number of users that will be accepted From 9746e3cc93a38a0fafd06e3b189be750911abc03 Mon Sep 17 00:00:00 2001 From: SHU-red <68030498+SHU-red@users.noreply.github.com> Date: Tue, 6 Jan 2026 16:00:52 +0100 Subject: [PATCH 6/7] Update database names and ports in docker-compose --- docker-compose.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 071f1e8..3a8b60f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -7,7 +7,7 @@ services: - ${MARIADB_INIT_PATH:-./data/initdb.d/init.sql}:/config/initdb.d/init.sql restart: unless-stopped environment: - MYSQL_DATABASE: syncstorage_rs + MYSQL_DATABASE: syncstorage MYSQL_USER: sync MYSQL_PASSWORD: ${MYSQL_PASSWORD} MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} @@ -17,14 +17,14 @@ services: build: ./app/ restart: unless-stopped ports: - - "${SYNCSERVER_HOST_PORT:-5300}:8000" + - "${SYNCSERVER_HOST_PORT:-8000}:8000" depends_on: - mariadb environment: LOGLEVEL: info SYNC_URL: ${SYNC_URL} - SYNC_CAPACITY: 10 # Max number of users that will be accepted + SYNC_CAPACITY: 10 SYNC_MASTER_SECRET: ${SYNC_MASTER_SECRET} METRICS_HASH_SECRET: ${METRICS_HASH_SECRET} - SYNC_SYNCSTORAGE_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/syncstorage_rs?ssl-mode=disabled - SYNC_TOKENSERVER_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/tokenserver_rs?ssl-mode=disabled + SYNC_SYNCSTORAGE_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/syncstorage_rs + SYNC_TOKENSERVER_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/tokenserver_rs From 808120a4cab449c5a2241c4799192a00b284e892 Mon Sep 17 00:00:00 2001 From: SHU-red <68030498+SHU-red@users.noreply.github.com> Date: Tue, 6 Jan 2026 16:10:29 +0100 Subject: [PATCH 7/7] Modify MariaDB configuration in docker-compose Updated database paths and environment variables for MariaDB. --- docker-compose.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 3a8b60f..4ba27c2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -4,10 +4,9 @@ services: image: linuxserver/mariadb:10.6.13 volumes: - ${MARIADB_DATA_PATH:-./data/config}:/config - - ${MARIADB_INIT_PATH:-./data/initdb.d/init.sql}:/config/initdb.d/init.sql restart: unless-stopped environment: - MYSQL_DATABASE: syncstorage + MYSQL_DATABASE: syncstorage_rs MYSQL_USER: sync MYSQL_PASSWORD: ${MYSQL_PASSWORD} MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} @@ -26,5 +25,5 @@ services: SYNC_CAPACITY: 10 SYNC_MASTER_SECRET: ${SYNC_MASTER_SECRET} METRICS_HASH_SECRET: ${METRICS_HASH_SECRET} - SYNC_SYNCSTORAGE_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/syncstorage_rs - SYNC_TOKENSERVER_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/tokenserver_rs + SYNC_SYNCSTORAGE_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/syncstorage_rs?ssl-mode=disabled + SYNC_TOKENSERVER_DATABASE_URL: mysql://sync:${MYSQL_PASSWORD}@mariadb:3306/syncstorage_rs?ssl-mode=disabled