Skip to content

Commit 01df1fe

Browse files
committed
Updated default config
1 parent 2917b12 commit 01df1fe

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/server/core/config.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { resolve, dirname } from 'path';
22
import { existsSync, readFileSync } from 'fs';
3-
import { rootDir, name, version, currentDir } from '../info';
3+
import { name, version, currentDir } from '../info';
44
import { Dict, KrasConfiguration, LogLevel } from '../types';
55
import * as chalk from 'chalk';
66

@@ -209,14 +209,16 @@ export function mergeConfiguration(
209209
return result;
210210
}
211211

212+
const certDir = resolve(__dirname, '../../../cert');
213+
212214
export const defaultConfig = {
213215
name: `${name} v${version}`,
214216
port: 9000,
215217
directory: resolve(currentDir, 'mocks'),
216218
client: 'kras-management-portal',
217219
ssl: {
218-
cert: 'kras/cert/server.crt',
219-
key: 'kras/cert/server.key',
220+
cert: resolve(certDir, 'server.crt'),
221+
key: resolve(certDir, 'server.key'),
220222
},
221223
uploadLimit: parseInt(process.env.FILE_SIZE_LIMIT, 10) || 10, // default: 10 MB
222224
logLevel: 'error',

src/server/core/readSsl.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
import { readFileSync } from 'fs';
2+
import { isAbsolute } from 'path';
23
import { SslConfiguration } from '../types';
34

45
function fileReader(path: string) {
5-
try {
6-
path = require.resolve(path);
7-
} catch {}
6+
if (!isAbsolute(path)) {
7+
try {
8+
path = require.resolve(path);
9+
} catch {}
10+
}
811

912
return readFileSync(path);
1013
}

0 commit comments

Comments
 (0)