16 files changed, 42 insertions, 42 deletions

diff --git a/server/initializers/checker-after-init.ts b/server/initializers/checker-after-init.ts
index 906a918e3..5ef72058b 100644
--- a/server/initializers/checker-after-init.ts
+++ b/server/initializers/checker-after-init.ts
@@ -217,7 +217,7 @@ function checkStorageConfig () {
     }
   }
 
-  if (CONFIG.STORAGE.VIDEOS_DIR === CONFIG.STORAGE.REDUNDANCY_DIR) {
+  if (CONFIG.STORAGE.WEB_VIDEOS_DIR === CONFIG.STORAGE.REDUNDANCY_DIR) {
     logger.warn('Redundancy directory should be different than the videos folder.')
   }
 }
@@ -290,7 +290,7 @@ function checkLiveConfig () {
 function checkObjectStorageConfig () {
   if (CONFIG.OBJECT_STORAGE.ENABLED === true) {
 
-    if (!CONFIG.OBJECT_STORAGE.VIDEOS.BUCKET_NAME) {
+    if (!CONFIG.OBJECT_STORAGE.WEB_VIDEOS.BUCKET_NAME) {
       throw new Error('videos_bucket should be set when object storage support is enabled.')
     }
 
@@ -299,10 +299,10 @@ function checkObjectStorageConfig () {
     }
 
     if (
-      CONFIG.OBJECT_STORAGE.VIDEOS.BUCKET_NAME === CONFIG.OBJECT_STORAGE.STREAMING_PLAYLISTS.BUCKET_NAME &&
-      CONFIG.OBJECT_STORAGE.VIDEOS.PREFIX === CONFIG.OBJECT_STORAGE.STREAMING_PLAYLISTS.PREFIX
+      CONFIG.OBJECT_STORAGE.WEB_VIDEOS.BUCKET_NAME === CONFIG.OBJECT_STORAGE.STREAMING_PLAYLISTS.BUCKET_NAME &&
+      CONFIG.OBJECT_STORAGE.WEB_VIDEOS.PREFIX === CONFIG.OBJECT_STORAGE.STREAMING_PLAYLISTS.PREFIX
     ) {
-      if (CONFIG.OBJECT_STORAGE.VIDEOS.PREFIX === '') {
+      if (CONFIG.OBJECT_STORAGE.WEB_VIDEOS.PREFIX === '') {
         throw new Error('Object storage bucket prefixes should be set when the same bucket is used for both types of video.')
       }
 
diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts
index 3d117d1b9..a872fcba3 100644
--- a/server/initializers/checker-before-init.ts
+++ b/server/initializers/checker-before-init.ts
@@ -18,7 +18,7 @@ function checkMissedConfig () {
     'database.hostname', 'database.port', 'database.username', 'database.password', 'database.pool.max',
     'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address',
     'email.body.signature', 'email.subject.prefix',
-    'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache',
+    'storage.avatars', 'storage.web_videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache',
     'storage.redundancy', 'storage.tmp', 'storage.streaming_playlists', 'storage.plugins', 'storage.well_known',
     'log.level', 'log.rotation.enabled', 'log.rotation.max_file_size', 'log.rotation.max_files', 'log.anonymize_ip',
     'log.log_ping_requests', 'log.log_tracker_unknown_infohash', 'log.prettify_sql', 'log.accept_client_log',
@@ -60,8 +60,8 @@ function checkMissedConfig () {
     'object_storage.enabled', 'object_storage.endpoint', 'object_storage.region', 'object_storage.upload_acl.public',
     'object_storage.upload_acl.private', 'object_storage.proxy.proxify_private_files', 'object_storage.credentials.access_key_id',
     'object_storage.credentials.secret_access_key', 'object_storage.max_upload_part', 'object_storage.streaming_playlists.bucket_name',
-    'object_storage.streaming_playlists.prefix', 'object_storage.streaming_playlists.base_url', 'object_storage.videos.bucket_name',
-    'object_storage.videos.prefix', 'object_storage.videos.base_url',
+    'object_storage.streaming_playlists.prefix', 'object_storage.streaming_playlists.base_url', 'object_storage.web_videos.bucket_name',
+    'object_storage.web_videos.prefix', 'object_storage.web_videos.base_url',
     'theme.default',
     'feeds.videos.count', 'feeds.comments.count',
     'geo_ip.enabled', 'geo_ip.country.database_url',
diff --git a/server/initializers/config.ts b/server/initializers/config.ts
index 5301a1708..37cd852f1 100644
--- a/server/initializers/config.ts
+++ b/server/initializers/config.ts
@@ -106,9 +106,9 @@ const CONFIG = {
     TMP_DIR: buildPath(config.get<string>('storage.tmp')),
     TMP_PERSISTENT_DIR: buildPath(config.get<string>('storage.tmp_persistent')),
     BIN_DIR: buildPath(config.get<string>('storage.bin')),
-    ACTOR_IMAGES: buildPath(config.get<string>('storage.avatars')),
+    ACTOR_IMAGES_DIR: buildPath(config.get<string>('storage.avatars')),
     LOG_DIR: buildPath(config.get<string>('storage.logs')),
-    VIDEOS_DIR: buildPath(config.get<string>('storage.videos')),
+    WEB_VIDEOS_DIR: buildPath(config.get<string>('storage.web_videos')),
     STREAMING_PLAYLISTS_DIR: buildPath(config.get<string>('storage.streaming_playlists')),
     REDUNDANCY_DIR: buildPath(config.get<string>('storage.redundancy')),
     THUMBNAILS_DIR: buildPath(config.get<string>('storage.thumbnails')),
@@ -140,10 +140,10 @@ const CONFIG = {
     PROXY: {
       PROXIFY_PRIVATE_FILES: config.get<boolean>('object_storage.proxy.proxify_private_files')
     },
-    VIDEOS: {
-      BUCKET_NAME: config.get<string>('object_storage.videos.bucket_name'),
-      PREFIX: config.get<string>('object_storage.videos.prefix'),
-      BASE_URL: config.get<string>('object_storage.videos.base_url')
+    WEB_VIDEOS: {
+      BUCKET_NAME: config.get<string>('object_storage.web_videos.bucket_name'),
+      PREFIX: config.get<string>('object_storage.web_videos.prefix'),
+      BASE_URL: config.get<string>('object_storage.web_videos.base_url')
     },
     STREAMING_PLAYLISTS: {
       BUCKET_NAME: config.get<string>('object_storage.streaming_playlists.bucket_name'),
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index d87aa6f54..5116c6396 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -881,8 +881,8 @@ const DIRECTORIES = {
   },
 
   VIDEOS: {
-    PUBLIC: CONFIG.STORAGE.VIDEOS_DIR,
-    PRIVATE: join(CONFIG.STORAGE.VIDEOS_DIR, 'private')
+    PUBLIC: CONFIG.STORAGE.WEB_VIDEOS_DIR,
+    PRIVATE: join(CONFIG.STORAGE.WEB_VIDEOS_DIR, 'private')
   },
 
   HLS_REDUNDANCY: join(CONFIG.STORAGE.REDUNDANCY_DIR, 'hls')
diff --git a/server/lib/files-cache/avatar-permanent-file-cache.ts b/server/lib/files-cache/avatar-permanent-file-cache.ts
index 1d77c5bc1..0c508b063 100644
--- a/server/lib/files-cache/avatar-permanent-file-cache.ts
+++ b/server/lib/files-cache/avatar-permanent-file-cache.ts
@@ -7,7 +7,7 @@ import { AbstractPermanentFileCache } from './shared'
 export class AvatarPermanentFileCache extends AbstractPermanentFileCache<MActorImage> {
 
   constructor () {
-    super(CONFIG.STORAGE.ACTOR_IMAGES)
+    super(CONFIG.STORAGE.ACTOR_IMAGES_DIR)
   }
 
   protected loadModel (filename: string) {
diff --git a/server/lib/local-actor.ts b/server/lib/local-actor.ts
index 872addc58..611e6d0af 100644
--- a/server/lib/local-actor.ts
+++ b/server/lib/local-actor.ts
@@ -40,7 +40,7 @@ export async function updateLocalActorImageFiles (
     const extension = getLowercaseExtension(imagePhysicalFile.filename)
 
     const imageName = buildUUID() + extension
-    const destination = join(CONFIG.STORAGE.ACTOR_IMAGES, imageName)
+    const destination = join(CONFIG.STORAGE.ACTOR_IMAGES_DIR, imageName)
     await processImageFromWorker({ path: imagePhysicalFile.path, destination, newSize: imageSize, keepOriginal: true })
 
     return {
diff --git a/server/lib/object-storage/pre-signed-urls.ts b/server/lib/object-storage/pre-signed-urls.ts
index 313654a57..caf149bb8 100644
--- a/server/lib/object-storage/pre-signed-urls.ts
+++ b/server/lib/object-storage/pre-signed-urls.ts
@@ -15,8 +15,8 @@ export async function generateWebVideoPresignedUrl (options: {
   const key = generateWebVideoObjectStorageKey(file.filename)
 
   const command = new GetObjectCommand({
-    Bucket: CONFIG.OBJECT_STORAGE.VIDEOS.BUCKET_NAME,
-    Key: buildKey(key, CONFIG.OBJECT_STORAGE.VIDEOS),
+    Bucket: CONFIG.OBJECT_STORAGE.WEB_VIDEOS.BUCKET_NAME,
+    Key: buildKey(key, CONFIG.OBJECT_STORAGE.WEB_VIDEOS),
     ResponseContentDisposition: `attachment; filename=${downloadFilename}`
   })
 
diff --git a/server/lib/object-storage/urls.ts b/server/lib/object-storage/urls.ts
index 84bc1f6c0..d25f84026 100644
--- a/server/lib/object-storage/urls.ts
+++ b/server/lib/object-storage/urls.ts
@@ -10,7 +10,7 @@ function getInternalUrl (config: BucketInfo, keyWithoutPrefix: string) {
 // ---------------------------------------------------------------------------
 
 function getWebVideoPublicFileUrl (fileUrl: string) {
-  const baseUrl = CONFIG.OBJECT_STORAGE.VIDEOS.BASE_URL
+  const baseUrl = CONFIG.OBJECT_STORAGE.WEB_VIDEOS.BASE_URL
   if (!baseUrl) return fileUrl
 
   return replaceByBaseUrl(fileUrl, baseUrl)
diff --git a/server/lib/object-storage/videos.ts b/server/lib/object-storage/videos.ts
index 300c1f7e1..891e9ff76 100644
--- a/server/lib/object-storage/videos.ts
+++ b/server/lib/object-storage/videos.ts
@@ -59,7 +59,7 @@ function storeWebVideoFile (video: MVideo, file: MVideoFile) {
   return storeObject({
     inputPath: VideoPathManager.Instance.getFSVideoFileOutputPath(video, file),
     objectStorageKey: generateWebVideoObjectStorageKey(file.filename),
-    bucketInfo: CONFIG.OBJECT_STORAGE.VIDEOS,
+    bucketInfo: CONFIG.OBJECT_STORAGE.WEB_VIDEOS,
     isPrivate: video.hasPrivateStaticPath()
   })
 }
@@ -69,7 +69,7 @@ function storeWebVideoFile (video: MVideo, file: MVideoFile) {
 async function updateWebVideoFileACL (video: MVideo, file: MVideoFile) {
   await updateObjectACL({
     objectStorageKey: generateWebVideoObjectStorageKey(file.filename),
-    bucketInfo: CONFIG.OBJECT_STORAGE.VIDEOS,
+    bucketInfo: CONFIG.OBJECT_STORAGE.WEB_VIDEOS,
     isPrivate: video.hasPrivateStaticPath()
   })
 }
@@ -103,7 +103,7 @@ function removeHLSFileObjectStorageByFullKey (key: string) {
 // ---------------------------------------------------------------------------
 
 function removeWebVideoObjectStorage (videoFile: MVideoFile) {
-  return removeObject(generateWebVideoObjectStorageKey(videoFile.filename), CONFIG.OBJECT_STORAGE.VIDEOS)
+  return removeObject(generateWebVideoObjectStorageKey(videoFile.filename), CONFIG.OBJECT_STORAGE.WEB_VIDEOS)
 }
 
 // ---------------------------------------------------------------------------
@@ -130,7 +130,7 @@ async function makeWebVideoFileAvailable (filename: string, destination: string)
   await makeAvailable({
     key,
     destination,
-    bucketInfo: CONFIG.OBJECT_STORAGE.VIDEOS
+    bucketInfo: CONFIG.OBJECT_STORAGE.WEB_VIDEOS
   })
 
   return destination
@@ -148,7 +148,7 @@ function getWebVideoFileReadStream (options: {
 
   return createObjectReadStream({
     key,
-    bucketInfo: CONFIG.OBJECT_STORAGE.VIDEOS,
+    bucketInfo: CONFIG.OBJECT_STORAGE.WEB_VIDEOS,
     rangeHeader
   })
 }
diff --git a/server/models/actor/actor-image.ts b/server/models/actor/actor-image.ts
index 9c34a0101..51085a16d 100644
--- a/server/models/actor/actor-image.ts
+++ b/server/models/actor/actor-image.ts
@@ -157,11 +157,11 @@ export class ActorImageModel extends Model<Partial<AttributesOnly<ActorImageMode
   }
 
   getPath () {
-    return join(CONFIG.STORAGE.ACTOR_IMAGES, this.filename)
+    return join(CONFIG.STORAGE.ACTOR_IMAGES_DIR, this.filename)
   }
 
   removeImage () {
-    const imagePath = join(CONFIG.STORAGE.ACTOR_IMAGES, this.filename)
+    const imagePath = join(CONFIG.STORAGE.ACTOR_IMAGES_DIR, this.filename)
     return remove(imagePath)
   }
 
diff --git a/server/tests/api/object-storage/videos.ts b/server/tests/api/object-storage/videos.ts
index c4f72bbe4..dcc52ef06 100644
--- a/server/tests/api/object-storage/videos.ts
+++ b/server/tests/api/object-storage/videos.ts
@@ -181,7 +181,7 @@ function runTestSuite (options: {
             : undefined
         },
 
-        videos: {
+        web_videos: {
           bucket_name: options.webVideoBucket,
           prefix: options.webVideoPrefix,
           base_url: baseMockUrl
@@ -308,7 +308,7 @@ describe('Object storage for videos', function () {
             bucket_name: 'aaa'
           },
 
-          videos: {
+          web_videos: {
             bucket_name: 'aaa'
           }
         }
@@ -386,7 +386,7 @@ describe('Object storage for videos', function () {
   describe('Test simple object storage', function () {
     runTestSuite({
       playlistBucket: objectStorage.getMockBucketName('streaming-playlists'),
-      webVideoBucket: objectStorage.getMockBucketName('videos')
+      webVideoBucket: objectStorage.getMockBucketName('web-videos')
     })
   })
 
@@ -431,7 +431,7 @@ describe('Object storage for videos', function () {
     runTestSuite({
       maxUploadPart,
       playlistBucket: objectStorage.getMockBucketName('streaming-playlists'),
-      webVideoBucket: objectStorage.getMockBucketName('videos'),
+      webVideoBucket: objectStorage.getMockBucketName('web-videos'),
       fixture
     })
   })
diff --git a/server/tests/api/redundancy/redundancy.ts b/server/tests/api/redundancy/redundancy.ts
index 9a8cb4f51..85da6acf5 100644
--- a/server/tests/api/redundancy/redundancy.ts
+++ b/server/tests/api/redundancy/redundancy.ts
@@ -160,7 +160,7 @@ async function check2Webseeds (videoUUID?: string) {
 
   const directories = [
     servers[0].getDirectoryPath('redundancy'),
-    servers[1].getDirectoryPath('videos')
+    servers[1].getDirectoryPath('web-videos')
   ]
 
   for (const directory of directories) {
diff --git a/server/tests/api/transcoding/hls.ts b/server/tests/api/transcoding/hls.ts
index 0d2fc0fba..d67043c2a 100644
--- a/server/tests/api/transcoding/hls.ts
+++ b/server/tests/api/transcoding/hls.ts
@@ -75,8 +75,8 @@ describe('Test HLS videos', function () {
 
     it('Should have the playlists/segment deleted from the disk', async function () {
       for (const server of servers) {
-        await checkDirectoryIsEmpty(server, 'videos', [ 'private' ])
-        await checkDirectoryIsEmpty(server, join('videos', 'private'))
+        await checkDirectoryIsEmpty(server, 'web-videos', [ 'private' ])
+        await checkDirectoryIsEmpty(server, join('web-videos', 'private'))
 
         await checkDirectoryIsEmpty(server, join('streaming-playlists', 'hls'), [ 'private' ])
         await checkDirectoryIsEmpty(server, join('streaming-playlists', 'hls', 'private'))
diff --git a/server/tests/api/transcoding/transcoder.ts b/server/tests/api/transcoding/transcoder.ts
index b899b736d..5386d236f 100644
--- a/server/tests/api/transcoding/transcoder.ts
+++ b/server/tests/api/transcoding/transcoder.ts
@@ -586,7 +586,7 @@ describe('Test video transcoding', function () {
             '1440p': true,
             '2160p': true
           },
-          web_videos: { enabled: true },
+          webVideos: { enabled: true },
           hls: { enabled: true }
         }
       }
diff --git a/server/tests/cli/create-move-video-storage-job.ts b/server/tests/cli/create-move-video-storage-job.ts
index 253fc983e..fc6a8e648 100644
--- a/server/tests/cli/create-move-video-storage-job.ts
+++ b/server/tests/cli/create-move-video-storage-job.ts
@@ -109,8 +109,8 @@ describe('Test create move video storage job', function () {
   })
 
   it('Should not have files on disk anymore', async function () {
-    await checkDirectoryIsEmpty(servers[0], 'videos', [ 'private' ])
-    await checkDirectoryIsEmpty(servers[0], join('videos', 'private'))
+    await checkDirectoryIsEmpty(servers[0], 'web-videos', [ 'private' ])
+    await checkDirectoryIsEmpty(servers[0], join('web-videos', 'private'))
 
     await checkDirectoryIsEmpty(servers[0], join('streaming-playlists', 'hls'), [ 'private' ])
     await checkDirectoryIsEmpty(servers[0], join('streaming-playlists', 'hls', 'private'))
diff --git a/server/tests/cli/prune-storage.ts b/server/tests/cli/prune-storage.ts
index b60e522a4..561ed6a68 100644
--- a/server/tests/cli/prune-storage.ts
+++ b/server/tests/cli/prune-storage.ts
@@ -35,10 +35,10 @@ async function assertNotExists (server: PeerTubeServer, directory: string, subst
 
 async function assertCountAreOkay (servers: PeerTubeServer[]) {
   for (const server of servers) {
-    const videosCount = await countFiles(server, 'videos')
+    const videosCount = await countFiles(server, 'web-videos')
     expect(videosCount).to.equal(9) // 2 videos with 4 resolutions + private directory
 
-    const privateVideosCount = await countFiles(server, 'videos/private')
+    const privateVideosCount = await countFiles(server, 'web-videos/private')
     expect(privateVideosCount).to.equal(4)
 
     const torrentsCount = await countFiles(server, 'torrents')
@@ -131,8 +131,8 @@ describe('Test prune storage scripts', function () {
   it('Should create some dirty files', async function () {
     for (let i = 0; i < 2; i++) {
       {
-        const basePublic = servers[0].servers.buildDirectory('videos')
-        const basePrivate = servers[0].servers.buildDirectory(join('videos', 'private'))
+        const basePublic = servers[0].servers.buildDirectory('web-videos')
+        const basePrivate = servers[0].servers.buildDirectory(join('web-videos', 'private'))
 
         const n1 = buildUUID() + '.mp4'
         const n2 = buildUUID() + '.webm'