hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 07:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup and readme updates

Browse Source
This commit is contained in:
William Welling
2021-12-07 11:38:48 -06:00
parent 33488ccf40
commit 46bb3e109c
4 changed files with 165 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/config/config.server.ts
View File

@@ -6,7 +6,7 @@ import { AppConfig } from './app-config.interface';
import { Config } from './config.interface';
import { DefaultAppConfig } from './default-app-config';
import { ServerConfig } from './server-config.interface';
import { extendConfig } from './config.util';
import { mergeConfig } from './config.util';
import { isNotEmpty } from '../app/shared/empty.util';
const CONFIG_PATH = join(process.cwd(), 'config');
@@ -78,7 +78,7 @@ const overrideWithConfig = (config: Config, pathToConfig: string) => {
try {
console.log(`Overriding app config with ${pathToConfig}`);
const externalConfig = fs.readFileSync(pathToConfig, 'utf8');
extendConfig(config, JSON.parse(externalConfig));
mergeConfig(config, JSON.parse(externalConfig));
} catch (err) {
console.error(err);
}