Update configuration paths for runtime settings, migrating from project root to data/config directory for better Docker volume persistence. Adjust localization strings to reflect new file location and enhance backup service documentation for clarity.

Author: Cohen, Yohay

.dockerignore

@@ -4,6 +4,7 @@ dist
 **/dist
 .env
 runtime-settings.json
+data/config/runtime-settings.json
 .git
 .github
 .vscode

.gitignore

@@ -2,6 +2,7 @@ node_modules
 dist
 .env
 runtime-settings.json
+data/config/runtime-settings.json
 .DS_Store
 coverage
 *.log

client/src/locales/en.json

@@ -1114,7 +1114,7 @@
     },
     "env": {
         "title": "Environment Variables",
-        "subtitle": "Configure system-level settings stored in runtime-settings.json at the project root",
+        "subtitle": "Configure system-level settings stored in data/config/runtime-settings.json (next to your database; persists with the data folder / Docker volume)",
         "profile_encryption_note": "Saved bank credentials are encrypted with your app password (set via the strip under the header). If you still have ENCRYPTION_KEY in runtime-settings.json from an older setup, unlock once after upgrade — profiles are re-encrypted automatically and you can remove that variable.",
         "enter_value": "Enter {{key}}...",
         "generate_random_key": "Generate random key",

client/src/locales/he.json

@@ -1114,7 +1114,7 @@
     },
     "env": {
         "title": "משתני סביבה",
-        "subtitle": "הגדרת משתני מערכת הנשמרים בקובץ runtime-settings.json בשורש הפרויקט",
+        "subtitle": "הגדרת משתני מערכת הנשמרים ב-data/config/runtime-settings.json (ליד מסד הנתונים; נשמר עם תיקיית הנתונים / נפח Docker)",
         "profile_encryption_note": "פרטי התחברות לבנקים נשמרים מוצפנים עם סיסמת האפליקציה (מוגדרת בשורה מתחת לכותרת). אם עדיין קיים ENCRYPTION_KEY ב-runtime-settings.json מהגדרה ישנה, בטל נעילה פעם אחת אחרי העדכון — הפרופילים יוצפנו מחדש אוטומטית ואפשר להסיר את המשתנה.",
         "enter_value": "הזן {{key}}...",
         "generate_random_key": "צור מפתח אקראי",

client/vite.config.ts

@@ -11,13 +11,18 @@ function normalizeBase(raw: string): string {
 
 function readBackendPort(): string {
     if (process.env.PORT) return process.env.PORT
-    try {
-        const p = path.resolve(__dirname, '..', 'runtime-settings.json')
-        const raw = fs.readFileSync(p, 'utf8')
-        const j = JSON.parse(raw) as { PORT?: string }
-        if (j.PORT) return String(j.PORT)
-    } catch {
-        // default matches server/src/index.ts
+    const candidates = [
+        path.resolve(__dirname, '..', 'data', 'config', 'runtime-settings.json'),
+        path.resolve(__dirname, '..', 'runtime-settings.json')
+    ]
+    for (const p of candidates) {
+        try {
+            const raw = fs.readFileSync(p, 'utf8')
+            const j = JSON.parse(raw) as { PORT?: string }
+            if (j.PORT) return String(j.PORT)
+        } catch {
+            // try next path
+        }
     }
     return '3001'
 }

server/src/runtimeEnv.ts

@@ -8,7 +8,10 @@ const __dirname = path.dirname(__filename);
 /** Repository root (parent of server/). */
 export const PROJECT_ROOT = path.resolve(__dirname, '../..');
 
-export const RUNTIME_SETTINGS_PATH = path.join(PROJECT_ROOT, 'runtime-settings.json');
+const DATA_DIR_RESOLVED = path.resolve(process.env.DATA_DIR || './data');
+/** Persisted env (API keys, OAuth, etc.) under the data directory so Docker volume mounts keep settings across restarts. */
+export const RUNTIME_SETTINGS_PATH = path.join(DATA_DIR_RESOLVED, 'config', 'runtime-settings.json');
+const LEGACY_RUNTIME_SETTINGS_PATH = path.join(PROJECT_ROOT, 'runtime-settings.json');
 
 const LEGACY_ENV_PATH = path.join(PROJECT_ROOT, '.env');
 
@@ -32,6 +35,28 @@ function parseEnvFile(content: string): Record<string, string> {
     return out;
 }
 
+/**
+ * One-time: copy project-root `runtime-settings.json` into `DATA_DIR/config/` (Docker-persisted path).
+ */
+function migrateLegacyRuntimeSettingsFile(): void {
+    if (fs.existsSync(RUNTIME_SETTINGS_PATH)) {
+        return;
+    }
+    if (!fs.existsSync(LEGACY_RUNTIME_SETTINGS_PATH)) {
+        return;
+    }
+    fs.ensureDirSync(path.dirname(RUNTIME_SETTINGS_PATH));
+    fs.copyFileSync(LEGACY_RUNTIME_SETTINGS_PATH, RUNTIME_SETTINGS_PATH);
+    try {
+        fs.unlinkSync(LEGACY_RUNTIME_SETTINGS_PATH);
+    } catch {
+        // keep legacy file if removal fails (e.g. permissions)
+    }
+    console.log(
+        '[runtime] Migrated runtime-settings.json from project root to DATA_DIR/config/ (persists with your data volume)'
+    );
+}
+
 /**
  * If a legacy `.env` exists, merge it into `runtime-settings.json` and remove `.env`.
  */
@@ -59,6 +84,7 @@ function migrateLegacyEnv(): void {
  * (OS / Docker env wins).
  */
 export function applyRuntimeSettings(): void {
+    migrateLegacyRuntimeSettingsFile();
     migrateLegacyEnv();
     if (!fs.existsSync(RUNTIME_SETTINGS_PATH)) {
         return;

server/src/services/backupService.ts

@@ -32,7 +32,7 @@ const BACKUP_TARGETS = [
 /** Optional JSON files stored directly under DATA_DIR (not in a subfolder). */
 const DATA_DIR_ROOT_CONFIG_FILES = ['scheduler_config.json', 'notification_config.json'] as const;
 
-/** Snapshot path for project-root runtime-settings.json (API keys, OAuth client id/secret, etc.). */
+/** Snapshot path label for runtime-settings (API keys, OAuth client id/secret, etc.); restored to DATA_DIR/config/runtime-settings.json. */
 const RUNTIME_SETTINGS_SNAPSHOT_PATH = 'root/runtime-settings.json';
 
 interface BackupEntry {