diff options
Diffstat (limited to 'shared/server-commands/server/server.ts')
-rw-r--r-- | shared/server-commands/server/server.ts | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/shared/server-commands/server/server.ts b/shared/server-commands/server/server.ts index 70f7a3ee2..38568a890 100644 --- a/shared/server-commands/server/server.ts +++ b/shared/server-commands/server/server.ts | |||
@@ -32,8 +32,10 @@ import { | |||
32 | HistoryCommand, | 32 | HistoryCommand, |
33 | ImportsCommand, | 33 | ImportsCommand, |
34 | LiveCommand, | 34 | LiveCommand, |
35 | VideoPasswordsCommand, | ||
35 | PlaylistsCommand, | 36 | PlaylistsCommand, |
36 | ServicesCommand, | 37 | ServicesCommand, |
38 | StoryboardCommand, | ||
37 | StreamingPlaylistsCommand, | 39 | StreamingPlaylistsCommand, |
38 | VideosCommand, | 40 | VideosCommand, |
39 | VideoStudioCommand, | 41 | VideoStudioCommand, |
@@ -146,6 +148,9 @@ export class PeerTubeServer { | |||
146 | twoFactor?: TwoFactorCommand | 148 | twoFactor?: TwoFactorCommand |
147 | videoToken?: VideoTokenCommand | 149 | videoToken?: VideoTokenCommand |
148 | registrations?: RegistrationsCommand | 150 | registrations?: RegistrationsCommand |
151 | videoPasswords?: VideoPasswordsCommand | ||
152 | |||
153 | storyboard?: StoryboardCommand | ||
149 | 154 | ||
150 | runners?: RunnersCommand | 155 | runners?: RunnersCommand |
151 | runnerRegistrationTokens?: RunnerRegistrationTokensCommand | 156 | runnerRegistrationTokens?: RunnerRegistrationTokensCommand |
@@ -232,7 +237,7 @@ export class PeerTubeServer { | |||
232 | } | 237 | } |
233 | 238 | ||
234 | // Share the environment | 239 | // Share the environment |
235 | const env = Object.create(process.env) | 240 | const env = { ...process.env } |
236 | env['NODE_ENV'] = 'test' | 241 | env['NODE_ENV'] = 'test' |
237 | env['NODE_APP_INSTANCE'] = this.internalServerNumber.toString() | 242 | env['NODE_APP_INSTANCE'] = this.internalServerNumber.toString() |
238 | env['NODE_CONFIG'] = JSON.stringify(configOverride) | 243 | env['NODE_CONFIG'] = JSON.stringify(configOverride) |
@@ -365,12 +370,13 @@ export class PeerTubeServer { | |||
365 | tmp_persistent: this.getDirectoryPath('tmp-persistent') + '/', | 370 | tmp_persistent: this.getDirectoryPath('tmp-persistent') + '/', |
366 | bin: this.getDirectoryPath('bin') + '/', | 371 | bin: this.getDirectoryPath('bin') + '/', |
367 | avatars: this.getDirectoryPath('avatars') + '/', | 372 | avatars: this.getDirectoryPath('avatars') + '/', |
368 | videos: this.getDirectoryPath('videos') + '/', | 373 | web_videos: this.getDirectoryPath('web-videos') + '/', |
369 | streaming_playlists: this.getDirectoryPath('streaming-playlists') + '/', | 374 | streaming_playlists: this.getDirectoryPath('streaming-playlists') + '/', |
370 | redundancy: this.getDirectoryPath('redundancy') + '/', | 375 | redundancy: this.getDirectoryPath('redundancy') + '/', |
371 | logs: this.getDirectoryPath('logs') + '/', | 376 | logs: this.getDirectoryPath('logs') + '/', |
372 | previews: this.getDirectoryPath('previews') + '/', | 377 | previews: this.getDirectoryPath('previews') + '/', |
373 | thumbnails: this.getDirectoryPath('thumbnails') + '/', | 378 | thumbnails: this.getDirectoryPath('thumbnails') + '/', |
379 | storyboards: this.getDirectoryPath('storyboards') + '/', | ||
374 | torrents: this.getDirectoryPath('torrents') + '/', | 380 | torrents: this.getDirectoryPath('torrents') + '/', |
375 | captions: this.getDirectoryPath('captions') + '/', | 381 | captions: this.getDirectoryPath('captions') + '/', |
376 | cache: this.getDirectoryPath('cache') + '/', | 382 | cache: this.getDirectoryPath('cache') + '/', |
@@ -434,8 +440,11 @@ export class PeerTubeServer { | |||
434 | this.videoToken = new VideoTokenCommand(this) | 440 | this.videoToken = new VideoTokenCommand(this) |
435 | this.registrations = new RegistrationsCommand(this) | 441 | this.registrations = new RegistrationsCommand(this) |
436 | 442 | ||
443 | this.storyboard = new StoryboardCommand(this) | ||
444 | |||
437 | this.runners = new RunnersCommand(this) | 445 | this.runners = new RunnersCommand(this) |
438 | this.runnerRegistrationTokens = new RunnerRegistrationTokensCommand(this) | 446 | this.runnerRegistrationTokens = new RunnerRegistrationTokensCommand(this) |
439 | this.runnerJobs = new RunnerJobsCommand(this) | 447 | this.runnerJobs = new RunnerJobsCommand(this) |
448 | this.videoPasswords = new VideoPasswordsCommand(this) | ||
440 | } | 449 | } |
441 | } | 450 | } |