diff options
author | Chocobozzz <me@florianbigard.com> | 2018-10-01 13:29:38 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-10-01 15:20:13 +0200 |
commit | d1105b97ef0b18626ad3b91e80b03d477baff8c6 (patch) | |
tree | 8bd5635e118fc42ee9875bb17bcb2a4163c6174b | |
parent | abb2c7927ca1640a755e0ec32c51bcc9c873b34c (diff) | |
download | PeerTube-d1105b97ef0b18626ad3b91e80b03d477baff8c6.tar.gz PeerTube-d1105b97ef0b18626ad3b91e80b03d477baff8c6.tar.zst PeerTube-d1105b97ef0b18626ad3b91e80b03d477baff8c6.zip |
Fix dnt route
-rwxr-xr-x | scripts/build/server.sh | 2 | ||||
-rw-r--r-- | server/controllers/static.ts | 2 | ||||
-rw-r--r-- | server/initializers/checker-after-init.ts | 4 |
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 | |||
5 | rm -rf ./dist | 5 | rm -rf ./dist |
6 | 6 | ||
7 | npm run tsc | 7 | npm run tsc |
8 | cp -r "./server/static" "./dist" | 8 | cp -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 @@ | |||
1 | import * as config from 'config' | 1 | import * as config from 'config' |
2 | import { promisify0, isProdInstance, parseDuration, isTestInstance } from '../helpers/core-utils' | 2 | import { isProdInstance, isTestInstance } from '../helpers/core-utils' |
3 | import { UserModel } from '../models/account/user' | 3 | import { UserModel } from '../models/account/user' |
4 | import { ApplicationModel } from '../models/application/application' | 4 | import { ApplicationModel } from '../models/application/application' |
5 | import { OAuthClientModel } from '../models/oauth/oauth-client' | 5 | import { OAuthClientModel } from '../models/oauth/oauth-client' |
@@ -7,7 +7,7 @@ import { parse } from 'url' | |||
7 | import { CONFIG } from './constants' | 7 | import { CONFIG } from './constants' |
8 | import { logger } from '../helpers/logger' | 8 | import { logger } from '../helpers/logger' |
9 | import { getServerActor } from '../helpers/utils' | 9 | import { getServerActor } from '../helpers/utils' |
10 | import { RecentlyAddedStrategy, VideosRedundancy } from '../../shared/models/redundancy' | 10 | import { RecentlyAddedStrategy } from '../../shared/models/redundancy' |
11 | import { isArray } from '../helpers/custom-validators/misc' | 11 | import { isArray } from '../helpers/custom-validators/misc' |
12 | import { uniq } from 'lodash' | 12 | import { uniq } from 'lodash' |
13 | 13 | ||