aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-10-01 13:29:38 +0200
committerChocobozzz <me@florianbigard.com>2018-10-01 15:20:13 +0200
commitd1105b97ef0b18626ad3b91e80b03d477baff8c6 (patch)
tree8bd5635e118fc42ee9875bb17bcb2a4163c6174b
parentabb2c7927ca1640a755e0ec32c51bcc9c873b34c (diff)
downloadPeerTube-d1105b97ef0b18626ad3b91e80b03d477baff8c6.tar.gz
PeerTube-d1105b97ef0b18626ad3b91e80b03d477baff8c6.tar.zst
PeerTube-d1105b97ef0b18626ad3b91e80b03d477baff8c6.zip
Fix dnt route
-rwxr-xr-xscripts/build/server.sh2
-rw-r--r--server/controllers/static.ts2
-rw-r--r--server/initializers/checker-after-init.ts4
3 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/server.sh b/scripts/build/server.sh
index bd4d1bf47..8a1d4ca9a 100755
--- a/scripts/build/server.sh
+++ b/scripts/build/server.sh
@@ -5,4 +5,4 @@ set -eu
5rm -rf ./dist 5rm -rf ./dist
6 6
7npm run tsc 7npm run tsc
8cp -r "./server/static" "./dist" 8cp -r "./server/static" "./dist/server"
diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index baafe1ac4..75e30353c 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -120,7 +120,7 @@ staticRouter.use('/.well-known/dnt-policy.txt',
120 (_, res: express.Response) => { 120 (_, res: express.Response) => {
121 res.type('text/plain') 121 res.type('text/plain')
122 122
123 return res.sendFile(join(root(), 'server/static/dnt-policy/dnt-policy-1.0.txt')) 123 return res.sendFile(join(root(), 'dist/server/static/dnt-policy/dnt-policy-1.0.txt'))
124 } 124 }
125) 125)
126 126
diff --git a/server/initializers/checker-after-init.ts b/server/initializers/checker-after-init.ts
index 588526235..72d846957 100644
--- a/server/initializers/checker-after-init.ts
+++ b/server/initializers/checker-after-init.ts
@@ -1,5 +1,5 @@
1import * as config from 'config' 1import * as config from 'config'
2import { promisify0, isProdInstance, parseDuration, isTestInstance } from '../helpers/core-utils' 2import { isProdInstance, isTestInstance } from '../helpers/core-utils'
3import { UserModel } from '../models/account/user' 3import { UserModel } from '../models/account/user'
4import { ApplicationModel } from '../models/application/application' 4import { ApplicationModel } from '../models/application/application'
5import { OAuthClientModel } from '../models/oauth/oauth-client' 5import { OAuthClientModel } from '../models/oauth/oauth-client'
@@ -7,7 +7,7 @@ import { parse } from 'url'
7import { CONFIG } from './constants' 7import { CONFIG } from './constants'
8import { logger } from '../helpers/logger' 8import { logger } from '../helpers/logger'
9import { getServerActor } from '../helpers/utils' 9import { getServerActor } from '../helpers/utils'
10import { RecentlyAddedStrategy, VideosRedundancy } from '../../shared/models/redundancy' 10import { RecentlyAddedStrategy } from '../../shared/models/redundancy'
11import { isArray } from '../helpers/custom-validators/misc' 11import { isArray } from '../helpers/custom-validators/misc'
12import { uniq } from 'lodash' 12import { uniq } from 'lodash'
13 13