X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server.ts;h=1286cf521ef15deedb6b9d735c0ff1553d3cdd21;hb=b75410b87d889ae5b1704cc7f9d32a3792db9075;hp=b2541eed680c525a033ec3825de69245e96fe975;hpb=2aaa1a3fdc49be77aec5309dab5507865c38d392;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server.ts b/server.ts
index b2541eed6..1286cf521 100644
--- a/server.ts
+++ b/server.ts
@@ -1,10 +1,6 @@
 import { registerTSPaths } from './server/helpers/register-ts-paths'
-
 registerTSPaths()
 
-// FIXME: https://github.com/nodejs/node/pull/16853
-require('tls').DEFAULT_ECDH_CURVE = 'auto'
-
 import { isTestInstance } from './server/helpers/core-utils'
 if (isTestInstance()) {
   require('source-map-support').install()
@@ -88,7 +84,7 @@ migrate()
 loadLanguages()
 
 // ----------- PeerTube modules -----------
-import { installApplication } from './server/initializers'
+import { installApplication } from './server/initializers/installer'
 import { Emailer } from './server/lib/emailer'
 import { JobQueue } from './server/lib/job-queue'
 import { VideosPreviewCache, VideosCaptionCache } from './server/lib/files-cache'
@@ -141,14 +137,14 @@ if (isTestInstance()) {
 }
 
 // For the logger
-morgan.token('remote-addr', req => {
-  if (req.get('DNT') === '1') {
+morgan.token<express.Request>('remote-addr', req => {
+  if (CONFIG.LOG.ANONYMIZE_IP === true || req.get('DNT') === '1') {
     return anonymize(req.ip, 16, 16)
   }
 
   return req.ip
 })
-morgan.token('user-agent', req => {
+morgan.token<express.Request>('user-agent', req => {
   if (req.get('DNT') === '1') {
     return useragent.parse(req.get('user-agent')).family
   }