aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers/static.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-04-11 11:33:44 +0200
committerChocobozzz <me@florianbigard.com>2019-04-11 13:45:39 +0200
commit6dd9de95dfa39bd5c1faed00d1dbd52cd112bae0 (patch)
treeb47de7efb8c6c611c63a15a971c6125a278f547a /server/controllers/static.ts
parent2c3abc4fa796555eb7d25f416c4f41ab3e3ad8ca (diff)
downloadPeerTube-6dd9de95dfa39bd5c1faed00d1dbd52cd112bae0.tar.gz
PeerTube-6dd9de95dfa39bd5c1faed00d1dbd52cd112bae0.tar.zst
PeerTube-6dd9de95dfa39bd5c1faed00d1dbd52cd112bae0.zip
Move config in its own file
Diffstat (limited to 'server/controllers/static.ts')
-rw-r--r--server/controllers/static.ts7
1 files changed, 4 insertions, 3 deletions
diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index e65c7afd3..be5fcc8ed 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -1,12 +1,12 @@
1import * as cors from 'cors' 1import * as cors from 'cors'
2import * as express from 'express' 2import * as express from 'express'
3import { 3import {
4 CONFIG,
5 HLS_STREAMING_PLAYLIST_DIRECTORY, 4 HLS_STREAMING_PLAYLIST_DIRECTORY,
6 ROUTE_CACHE_LIFETIME, 5 ROUTE_CACHE_LIFETIME,
7 STATIC_DOWNLOAD_PATHS, 6 STATIC_DOWNLOAD_PATHS,
8 STATIC_MAX_AGE, 7 STATIC_MAX_AGE,
9 STATIC_PATHS 8 STATIC_PATHS,
9 WEBSERVER
10} from '../initializers' 10} from '../initializers'
11import { VideosCaptionCache, VideosPreviewCache } from '../lib/files-cache' 11import { VideosCaptionCache, VideosPreviewCache } from '../lib/files-cache'
12import { cacheRoute } from '../middlewares/cache' 12import { cacheRoute } from '../middlewares/cache'
@@ -17,6 +17,7 @@ import { VideoCommentModel } from '../models/video/video-comment'
17import { HttpNodeinfoDiasporaSoftwareNsSchema20 } from '../../shared/models/nodeinfo' 17import { HttpNodeinfoDiasporaSoftwareNsSchema20 } from '../../shared/models/nodeinfo'
18import { join } from 'path' 18import { join } from 'path'
19import { root } from '../helpers/core-utils' 19import { root } from '../helpers/core-utils'
20import { CONFIG } from '../initializers/config'
20 21
21const packageJSON = require('../../../package.json') 22const packageJSON = require('../../../package.json')
22const staticRouter = express.Router() 23const staticRouter = express.Router()
@@ -121,7 +122,7 @@ staticRouter.use('/.well-known/nodeinfo',
121 links: [ 122 links: [
122 { 123 {
123 rel: 'http://nodeinfo.diaspora.software/ns/schema/2.0', 124 rel: 'http://nodeinfo.diaspora.software/ns/schema/2.0',
124 href: CONFIG.WEBSERVER.URL + '/nodeinfo/2.0.json' 125 href: WEBSERVER.URL + '/nodeinfo/2.0.json'
125 } 126 }
126 ] 127 ]
127 }) 128 })