diff options
Diffstat (limited to 'server/lib/server-config-manager.ts')
-rw-r--r-- | server/lib/server-config-manager.ts | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/server/lib/server-config-manager.ts b/server/lib/server-config-manager.ts index e87e2854f..ba7916363 100644 --- a/server/lib/server-config-manager.ts +++ b/server/lib/server-config-manager.ts | |||
@@ -126,11 +126,14 @@ class ServerConfigManager { | |||
126 | serverVersion: PEERTUBE_VERSION, | 126 | serverVersion: PEERTUBE_VERSION, |
127 | serverCommit: this.serverCommit, | 127 | serverCommit: this.serverCommit, |
128 | transcoding: { | 128 | transcoding: { |
129 | remoteRunners: { | ||
130 | enabled: CONFIG.TRANSCODING.ENABLED && CONFIG.TRANSCODING.REMOTE_RUNNERS.ENABLED | ||
131 | }, | ||
129 | hls: { | 132 | hls: { |
130 | enabled: CONFIG.TRANSCODING.HLS.ENABLED | 133 | enabled: CONFIG.TRANSCODING.ENABLED && CONFIG.TRANSCODING.HLS.ENABLED |
131 | }, | 134 | }, |
132 | webtorrent: { | 135 | webtorrent: { |
133 | enabled: CONFIG.TRANSCODING.WEBTORRENT.ENABLED | 136 | enabled: CONFIG.TRANSCODING.ENABLED && CONFIG.TRANSCODING.WEBTORRENT.ENABLED |
134 | }, | 137 | }, |
135 | enabledResolutions: this.getEnabledResolutions('vod'), | 138 | enabledResolutions: this.getEnabledResolutions('vod'), |
136 | profile: CONFIG.TRANSCODING.PROFILE, | 139 | profile: CONFIG.TRANSCODING.PROFILE, |
@@ -150,6 +153,9 @@ class ServerConfigManager { | |||
150 | 153 | ||
151 | transcoding: { | 154 | transcoding: { |
152 | enabled: CONFIG.LIVE.TRANSCODING.ENABLED, | 155 | enabled: CONFIG.LIVE.TRANSCODING.ENABLED, |
156 | remoteRunners: { | ||
157 | enabled: CONFIG.LIVE.TRANSCODING.ENABLED && CONFIG.LIVE.TRANSCODING.REMOTE_RUNNERS.ENABLED | ||
158 | }, | ||
153 | enabledResolutions: this.getEnabledResolutions('live'), | 159 | enabledResolutions: this.getEnabledResolutions('live'), |
154 | profile: CONFIG.LIVE.TRANSCODING.PROFILE, | 160 | profile: CONFIG.LIVE.TRANSCODING.PROFILE, |
155 | availableProfiles: VideoTranscodingProfilesManager.Instance.getAvailableProfiles('live') | 161 | availableProfiles: VideoTranscodingProfilesManager.Instance.getAvailableProfiles('live') |