X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.ts;h=b14ebf623297a9f3d56154379b737839ec5b5067;hb=a0e35412b92afa42dee54165afa51fa3953a1252;hp=b49d10344bb5a38b83739afe30fe7b350a85322d;hpb=464687bb96cf98d00714279750fd5f19a42b6a02;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server.ts b/server.ts index b49d10344..b14ebf623 100644 --- a/server.ts +++ b/server.ts @@ -1,16 +1,5 @@ -import { resolve } from 'path' - -const tsConfig = require('./tsconfig.json') -const tsConfigPaths = require('tsconfig-paths') - -// Thanks: https://github.com/dividab/tsconfig-paths/issues/75#issuecomment-458936883 -tsConfigPaths.register({ - baseUrl: resolve(tsConfig.compilerOptions.baseUrl || '', tsConfig.compilerOptions.outDir || ''), - paths: tsConfig.compilerOptions.paths -}) - -// FIXME: https://github.com/nodejs/node/pull/16853 -require('tls').DEFAULT_ECDH_CURVE = 'auto' +import { registerTSPaths } from './server/helpers/register-ts-paths' +registerTSPaths() import { isTestInstance } from './server/helpers/core-utils' if (isTestInstance()) { @@ -149,7 +138,7 @@ if (isTestInstance()) { // For the logger morgan.token('remote-addr', req => { - if (req.get('DNT') === '1') { + if (CONFIG.LOG.ANONYMIZE_IP === true || req.get('DNT') === '1') { return anonymize(req.ip, 16, 16) }