Ryan/docmost-ryan
1
0
Fork 0
mirror of https://github.com/Shadowfita/docmost.git synced 2025-11-13 00:02:30 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fix env path for Nestjs

Browse Source
This commit is contained in:
Philipinho
2024-03-23 00:08:44 +00:00
parent a40ba4b41e
commit f1d7ffb9dd
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/server/src/database/typeorm.config.ts
View File

@ -1,8 +1,7 @@
import { DataSource } from 'typeorm'; import { DataSource } from 'typeorm';
import * as dotenv from 'dotenv'; import * as dotenv from 'dotenv';
import { NamingStrategy } from './naming-strategy'; import { NamingStrategy } from './naming-strategy';
import * as path from 'path'; import { envPath } from '../helpers/utils';
const envPath = path.resolve(process.cwd(), '..', '..', '.env');
dotenv.config({ path: envPath }); dotenv.config({ path: envPath });

4
apps/server/src/helpers/utils.ts
View File

@ -1,5 +1,9 @@
import * as path from 'path';
export function generateHostname(name: string): string { export function generateHostname(name: string): string {
let hostname = name.replace(/[^a-z0-9]/gi, '').toLowerCase(); let hostname = name.replace(/[^a-z0-9]/gi, '').toLowerCase();
hostname = hostname.substring(0, 30); hostname = hostname.substring(0, 30);
return hostname; return hostname;
} }
export const envPath = path.resolve(process.cwd(), '..', '..', '.env');

2
apps/server/src/integrations/environment/environment.module.ts
View File

@ -2,6 +2,7 @@ import { Global, Module } from '@nestjs/common';
import { EnvironmentService } from './environment.service'; import { EnvironmentService } from './environment.service';
import { ConfigModule } from '@nestjs/config'; import { ConfigModule } from '@nestjs/config';
import { validate } from './environment.validation'; import { validate } from './environment.validation';
import { envPath } from '../../helpers/utils';
@Global() @Global()
@Module({ @Module({
@ -9,6 +10,7 @@ import { validate } from './environment.validation';
ConfigModule.forRoot({ ConfigModule.forRoot({
isGlobal: true, isGlobal: true,
expandVariables: true, expandVariables: true,
envFilePath: envPath,
validate, validate,
}), }),
], ],