Selaa lähdekoodia

fix(home-server): env var determining the sqlite database location (#626)

Karol Sójko 2 vuotta sitten
vanhempi
commit
0cb5e36b20

+ 1 - 0
.github/ci.env

@@ -4,6 +4,7 @@ DB_USERNAME=std_notes_user
 DB_PASSWORD=changeme123
 DB_DATABASE=standard_notes_db
 DB_PORT=3306
+DB_SQLITE_DATABASE_PATH=standard_notes_db
 REDIS_PORT=6379
 REDIS_HOST=cache
 AUTH_SERVER_ACCESS_TOKEN_AGE=4

+ 1 - 1
packages/auth/src/Bootstrap/DataSource.ts

@@ -109,7 +109,7 @@ export class AppDataSource {
       const sqliteDataSourceOptions: SqliteConnectionOptions = {
         ...commonDataSourceOptions,
         type: 'sqlite',
-        database: this.env.get('DB_DATABASE'),
+        database: this.env.get('DB_SQLITE_DATABASE_PATH'),
       }
 
       this.dataSource = new DataSource(sqliteDataSourceOptions)

+ 1 - 1
packages/home-server/src/Server/HomeServer.ts

@@ -36,7 +36,7 @@ export class HomeServer implements HomeServerInterface {
       const environmentOverrides = {
         DB_TYPE: 'sqlite',
         CACHE_TYPE: 'memory',
-        DB_DATABASE: `${configuration.dataDirectoryPath}/database/home_server.sqlite`,
+        DB_SQLITE_DATABASE_PATH: `${configuration.dataDirectoryPath}/database/home_server.sqlite`,
         FILE_UPLOAD_PATH: `${configuration.dataDirectoryPath}/uploads`,
         ...configuration.environment,
         MODE: 'home-server',

+ 1 - 1
packages/revisions/src/Bootstrap/DataSource.ts

@@ -79,7 +79,7 @@ export class AppDataSource {
       const sqliteDataSourceOptions: SqliteConnectionOptions = {
         ...commonDataSourceOptions,
         type: 'sqlite',
-        database: this.env.get('DB_DATABASE'),
+        database: this.env.get('DB_SQLITE_DATABASE_PATH'),
       }
 
       this.dataSource = new DataSource(sqliteDataSourceOptions)

+ 1 - 1
packages/syncing-server/src/Bootstrap/DataSource.ts

@@ -77,7 +77,7 @@ export class AppDataSource {
       const sqliteDataSourceOptions: SqliteConnectionOptions = {
         ...commonDataSourceOptions,
         type: 'sqlite',
-        database: this.env.get('DB_DATABASE'),
+        database: this.env.get('DB_SQLITE_DATABASE_PATH'),
       }
 
       this.dataSource = new DataSource(sqliteDataSourceOptions)