Skip to content

A local-first personal finance app

🐛 Fix config for default data dir (#4535)

lelemmcfc8186da16f
diff --git a/packages/sync-server/src/load-config.js b/packages/sync-server/src/load-config.js
index f39c6492b0..f57ae7841a 100644
--- a/packages/sync-server/src/load-config.js
+++ b/packages/sync-server/src/load-config.js
@@ -11,7 +11,11 @@ const debug = createDebug('actual:config');
const debugSensitive = createDebug('actual-sensitive:config');
const projectRoot = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
-const defaultDataDir = fs.existsSync('./data') ? './data' : projectRoot;
+const defaultDataDir = process.env.ACTUAL_DATA_DIR
+ ? process.env.ACTUAL_DATA_DIR
+ : fs.existsSync('/data')
+ ? '/data'
+ : projectRoot;
debug(`Project root: '${projectRoot}'`);
@@ -54,7 +58,7 @@ const configSchema = convict({
dataDir: {
doc: 'Default data directory.',
format: String,
- default: defaultDataDir,
+ default: process.env.NODE_ENV === 'test' ? projectRoot : defaultDataDir,
env: 'ACTUAL_DATA_DIR',
},
port: {
@@ -75,7 +79,7 @@ const configSchema = convict({
default:
process.env.NODE_ENV === 'test'
? path.join(projectRoot, 'test-server-files')
- : path.join(projectRoot, 'server-files'),
+ : path.join(defaultDataDir, 'server-files'),
env: 'ACTUAL_SERVER_FILES',
},
userFiles: {
@@ -84,7 +88,7 @@ const configSchema = convict({
default:
process.env.NODE_ENV === 'test'
? path.join(projectRoot, 'test-user-files')
- : path.join(projectRoot, 'user-files'),
+ : path.join(defaultDataDir, 'user-files'),
env: 'ACTUAL_USER_FILES',
},
webRoot: {
diff --git a/upcoming-release-notes/4535.md b/upcoming-release-notes/4535.md
new file mode 100644
index 0000000000..373b8c5a45
--- /dev/null
+++ b/upcoming-release-notes/4535.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [lelemm]
+---
+
+Fix config for default data directory
\ No newline at end of file