diff --git a/.env.example b/.env.example index 0a240b88..52a8269e 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1,5 @@ SERVER_IP=localhost -DATABASE_URL=./data/zerobyte.db +ZEROBYTE_DATABASE_URL=./data/zerobyte.db RESTIC_CACHE_DIR=./data/restic/cache ZEROBYTE_REPOSITORIES_DIR=./data/repositories ZEROBYTE_VOLUMES_DIR=./data/volumes diff --git a/.env.test b/.env.test index 3695cb28..131beb69 100644 --- a/.env.test +++ b/.env.test @@ -1,3 +1,3 @@ -DATABASE_URL=:memory: +ZEROBYTE_DATABASE_URL=:memory: APP_SECRET=8b9acd4456dd5db0a4a3c4f4e1240b2c3ae08bb59690167197425e4a25dd9a69 BASE_URL=http://localhost:4096 diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index b2fbb804..f073918d 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -49,7 +49,7 @@ jobs: chmod -R 777 playwright/temp touch .env.local echo "SERVER_IP=localhost" >> .env.local - echo "DATABASE_URL=./data/zerobyte.db" >> .env.local + echo "ZEROBYTE_DATABASE_URL=./data/zerobyte.db" >> .env.local echo "BASE_URL=http://localhost:4096" >> .env.local - name: Start zerobyte-e2e service diff --git a/README.md b/README.md index 53e2f42f..760b6086 100644 --- a/README.md +++ b/README.md @@ -352,7 +352,7 @@ For local development, create a `.env.local` file at the repo root and override ```bash # Example -DATABASE_URL=./data/zerobyte.db +ZEROBYTE_DATABASE_URL=./data/zerobyte.db APP_SECRET=your_app_secret_here RESTIC_PASS_FILE=./data/restic.pass RESTIC_CACHE_DIR=./data/restic/cache diff --git a/app/server/core/constants.ts b/app/server/core/constants.ts index eb12ed4e..22dfe503 100644 --- a/app/server/core/constants.ts +++ b/app/server/core/constants.ts @@ -5,11 +5,11 @@ export const REPOSITORY_BASE = process.env.ZEROBYTE_REPOSITORIES_DIR || "/var/li export const RESTIC_CACHE_DIR = process.env.RESTIC_CACHE_DIR || "/var/lib/zerobyte/restic/cache"; -export const DATABASE_URL = process.env.DATABASE_URL || "/var/lib/zerobyte/data/zerobyte.db"; +export const DATABASE_URL = process.env.ZEROBYTE_DATABASE_URL || "/var/lib/zerobyte/data/zerobyte.db"; export const RESTIC_PASS_FILE = process.env.RESTIC_PASS_FILE || "/var/lib/zerobyte/data/restic.pass"; export const RCLONE_CONFIG_DIR = process.env.RCLONE_CONFIG_DIR || "/root/.config/rclone"; -export const DEFAULT_EXCLUDES = [DATABASE_URL, RESTIC_PASS_FILE, REPOSITORY_BASE]; +export const DEFAULT_EXCLUDES = [RESTIC_PASS_FILE, REPOSITORY_BASE]; export const REGISTRATION_ENABLED_KEY = "registrations_enabled"; diff --git a/app/server/db/db.ts b/app/server/db/db.ts index 213b6bac..54b4fd21 100644 --- a/app/server/db/db.ts +++ b/app/server/db/db.ts @@ -10,14 +10,8 @@ import * as schema from "./schema"; fs.mkdirSync(path.dirname(DATABASE_URL), { recursive: true }); -if ( - fs.existsSync(path.join(path.dirname(DATABASE_URL), "ironmount.db")) && - !fs.existsSync(DATABASE_URL) -) { - fs.renameSync( - path.join(path.dirname(DATABASE_URL), "ironmount.db"), - DATABASE_URL, - ); +if (fs.existsSync(path.join(path.dirname(DATABASE_URL), "ironmount.db")) && !fs.existsSync(DATABASE_URL)) { + fs.renameSync(path.join(path.dirname(DATABASE_URL), "ironmount.db"), DATABASE_URL); } const sqlite = new Database(DATABASE_URL);