diff options
Diffstat (limited to 'server')
-rw-r--r-- | server/controllers/client.ts | 1 | ||||
-rw-r--r-- | server/controllers/static.ts | 1 | ||||
-rw-r--r-- | server/initializers/installer.ts | 4 | ||||
-rw-r--r-- | server/lib/cache/videos-preview-cache.ts | 3 |
4 files changed, 2 insertions, 7 deletions
diff --git a/server/controllers/client.ts b/server/controllers/client.ts index 1324e62cd..b23f7e1ae 100644 --- a/server/controllers/client.ts +++ b/server/controllers/client.ts | |||
@@ -6,7 +6,6 @@ import * as Promise from 'bluebird' | |||
6 | import { database as db } from '../initializers/database' | 6 | import { database as db } from '../initializers/database' |
7 | import { | 7 | import { |
8 | CONFIG, | 8 | CONFIG, |
9 | REMOTE_SCHEME, | ||
10 | STATIC_PATHS, | 9 | STATIC_PATHS, |
11 | STATIC_MAX_AGE, | 10 | STATIC_MAX_AGE, |
12 | OPENGRAPH_COMMENT | 11 | OPENGRAPH_COMMENT |
diff --git a/server/controllers/static.ts b/server/controllers/static.ts index 2fd14131e..b20bafc76 100644 --- a/server/controllers/static.ts +++ b/server/controllers/static.ts | |||
@@ -37,7 +37,6 @@ staticRouter.use( | |||
37 | ) | 37 | ) |
38 | 38 | ||
39 | // Video previews path for express | 39 | // Video previews path for express |
40 | const previewsPhysicalPath = CONFIG.STORAGE.PREVIEWS_DIR | ||
41 | staticRouter.use( | 40 | staticRouter.use( |
42 | STATIC_PATHS.PREVIEWS + ':uuid.jpg', | 41 | STATIC_PATHS.PREVIEWS + ':uuid.jpg', |
43 | getPreview | 42 | getPreview |
diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts index 3c5a77df9..26e92be0b 100644 --- a/server/initializers/installer.ts +++ b/server/initializers/installer.ts | |||
@@ -1,12 +1,10 @@ | |||
1 | import { join } from 'path' | ||
2 | import * as config from 'config' | ||
3 | import * as passwordGenerator from 'password-generator' | 1 | import * as passwordGenerator from 'password-generator' |
4 | import * as Promise from 'bluebird' | 2 | import * as Promise from 'bluebird' |
5 | 3 | ||
6 | import { database as db } from './database' | 4 | import { database as db } from './database' |
7 | import { USER_ROLES, CONFIG, LAST_MIGRATION_VERSION, CACHE } from './constants' | 5 | import { USER_ROLES, CONFIG, LAST_MIGRATION_VERSION, CACHE } from './constants' |
8 | import { clientsExist, usersExist } from './checker' | 6 | import { clientsExist, usersExist } from './checker' |
9 | import { logger, createCertsIfNotExist, root, mkdirpPromise, rimrafPromise } from '../helpers' | 7 | import { logger, createCertsIfNotExist, mkdirpPromise, rimrafPromise } from '../helpers' |
10 | 8 | ||
11 | function installApplication () { | 9 | function installApplication () { |
12 | return db.sequelize.sync() | 10 | return db.sequelize.sync() |
diff --git a/server/lib/cache/videos-preview-cache.ts b/server/lib/cache/videos-preview-cache.ts index 9d365e496..09e2e9a0d 100644 --- a/server/lib/cache/videos-preview-cache.ts +++ b/server/lib/cache/videos-preview-cache.ts | |||
@@ -1,11 +1,10 @@ | |||
1 | import * as request from 'request' | ||
2 | import * as asyncLRU from 'async-lru' | 1 | import * as asyncLRU from 'async-lru' |
3 | import { join } from 'path' | 2 | import { join } from 'path' |
4 | import { createWriteStream } from 'fs' | 3 | import { createWriteStream } from 'fs' |
5 | import * as Promise from 'bluebird' | 4 | import * as Promise from 'bluebird' |
6 | 5 | ||
7 | import { database as db, CONFIG, CACHE } from '../../initializers' | 6 | import { database as db, CONFIG, CACHE } from '../../initializers' |
8 | import { logger, writeFilePromise, unlinkPromise } from '../../helpers' | 7 | import { logger, unlinkPromise } from '../../helpers' |
9 | import { VideoInstance } from '../../models' | 8 | import { VideoInstance } from '../../models' |
10 | import { fetchRemotePreview } from '../../lib' | 9 | import { fetchRemotePreview } from '../../lib' |
11 | 10 | ||