TTK-27395 Changing pumukit.masters and pumukit.downloads (#681)

Co-authored-by: pablo.garcia <[email protected]>
pumukit · Dec 4, 2024 · 22793e4 · 22793e4
1 parent cddac98
commit 22793e4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 20 deletions.
diff --git a/.env b/.env
@@ -61,8 +61,6 @@ PUMUKIT_PUBLIC_DIR=/srv/pumukit/public/
 PUMUKIT_STORAGE_DIR=/srv/pumukit/public/storage
 PUMUKIT_INBOX=/srv/pumukit/public/storage/inbox
 PUMUKIT_TMP=/srv/pumukit/public/storage/tmp
-PUMUKIT_DOWNLOADS=/srv/pumukit/public/storage/downloads
-PUMUKIT_MASTERS=/srv/pumukit/public/storage/masters
 ENABLE_COOKIE_BANNER=false
 COOKIE_BANNER_PRIVACY_LINK=
 PUMUKIT_COPYRIGHT_INFO_URL=

diff --git a/config/packages/encoder.yaml b/config/packages/encoder.yaml
@@ -1,5 +1,3 @@
-
-
 pumukit_encoder:
   thumbnail:
     width: 768
@@ -24,7 +22,7 @@ pumukit_encoder:
         type: store
         host: 127.0.0.1
         description: Local master server
-        dir_out: "%pumukit.masters%"
+        dir_out: "%pumukit.masters_dir%"
       app: cp
       rel_duration_size: 1
       rel_duration_trans: 1
@@ -48,7 +46,7 @@ pumukit_encoder:
         type: store
         host: 127.0.0.1
         description: Local master server
-        dir_out: "%pumukit.masters%"
+        dir_out: "%pumukit.masters_dir%"
         url_out: "%pumukit.downloads_url%"
       app: ffmpeg
       rel_duration_size: 1
@@ -74,7 +72,7 @@ pumukit_encoder:
         type: download
         host: 127.0.0.1
         description: Local download server
-        dir_out: "%pumukit.downloads%"
+        dir_out: "%pumukit.downloads_dir%"
         url_out: "%pumukit.downloads_url%"
       app: ffmpeg
       rel_duration_size: 1
@@ -103,7 +101,7 @@ pumukit_encoder:
         type: download
         host: 127.0.0.1
         description: Local download server
-        dir_out: "%pumukit.downloads%"
+        dir_out: "%pumukit.downloads_dir%"
         url_out: "%pumukit.downloads_url%"
       app: ffmpeg
       rel_duration_size: 1
@@ -131,7 +129,7 @@ pumukit_encoder:
         type: download
         host: 127.0.0.1
         description: Local download server
-        dir_out: "%pumukit.downloads%"
+        dir_out: "%pumukit.downloads_dir%"
         url_out: "%pumukit.downloads_url%"
       app: ffmpeg
       rel_duration_size: 1
@@ -158,7 +156,7 @@ pumukit_encoder:
         type: download
         host: 127.0.0.1
         description: Local download server
-        dir_out: "%pumukit.downloads%"
+        dir_out: "%pumukit.downloads_dir%"
         url_out: "%pumukit.downloads_url%"
       app: ffmpeg
       rel_duration_size: 1
@@ -178,7 +176,7 @@ pumukit_encoder:
         type: download
         host: 127.0.0.1
         description: Local download server
-        dir_out: "%pumukit.downloads%"
+        dir_out: "%pumukit.downloads_dir%"
         url_out: "%pumukit.downloads_url%"
     image_raw_broadcastable:
       image: true
@@ -195,7 +193,7 @@ pumukit_encoder:
         type: download
         host: 127.0.0.1
         description: Local download server
-        dir_out: "%pumukit.downloads%"
+        dir_out: "%pumukit.downloads_dir%"
         url_out: "%pumukit.downloads_url%"
     document_broadcastable:
       document: true
@@ -211,7 +209,7 @@ pumukit_encoder:
         type: download
         host: 127.0.0.1
         description: Local download server
-        dir_out: "%pumukit.downloads%"
+        dir_out: "%pumukit.downloads_dir%"
         url_out: "%pumukit.downloads_url%"
 
   target_default_profiles:
@@ -223,6 +221,3 @@ pumukit_encoder:
     PUCHPODCAST:
       audio: "audio_broadcastable"
       video: "video_broadcastable audio_broadcastable"
-    PUCHLMS:
-      audio: "audio_broadcastable"
-      video: "video_broadcastable"
diff --git a/config/services.yaml b/config/services.yaml
@@ -36,8 +36,8 @@ parameters:
   pumukit.uploads_pic_url:             "%env(string:PUMUKIT_UPLOADS_PIC_URL)%"
   pumukit.inbox:                       "%env(string:PUMUKIT_INBOX)%"
   pumukit.tmp:                         "%env(string:PUMUKIT_TMP)%"
-  pumukit.masters:                     "%env(string:PUMUKIT_MASTERS)%"
-  pumukit.downloads:                   "%env(string:PUMUKIT_DOWNLOADS)%"
+  pumukit.masters_dir:                 "%env(string:PUMUKIT_STORAGE_DIR)%/masters"
+  pumukit.downloads_dir:               "%env(string:PUMUKIT_STORAGE_DIR)%/downloads"
   pumukit.downloads_url:               "%env(string:PUMUKIT_SCHEME)%://%env(string:PUMUKIT_FRONTEND_HOST)%/storage/downloads"
   pumukit.delete_on_disk:              "%env(bool:PUMUKIT_DELETE_ON_DISK)%"
   pumukit.copyright_info_url:          "%env(PUMUKIT_COPYRIGHT_INFO_URL)%"

diff --git a/src/Pumukit/CoreBundle/DependencyInjection/PumukitCoreExtension.php b/src/Pumukit/CoreBundle/DependencyInjection/PumukitCoreExtension.php
@@ -24,8 +24,8 @@ public function load(array $configs, ContainerBuilder $container): void
         $container->setParameter('pumukit.uploads_pic_dir', $config['uploads_pic_dir']);
         $container->setParameter('pumukit.inbox', $config['inbox']);
         $container->setParameter('pumukit.tmp', $config['tmp']);
-        $container->setParameter('pumukit.downloads', $config['downloads']);
-        $container->setParameter('pumukit.masters', $config['masters']);
+        $container->setParameter('pumukit.downloads_dir', $config['downloads']);
+        $container->setParameter('pumukit.masters_dir', $config['masters']);
         $container->setParameter('pumukit.delete_on_disk', $config['delete_on_disk']);
         $container->setParameter('pumukit.use_series_channels', $config['use_series_channels']);
         $container->setParameter('pumukit.full_magic_url', $config['full_magic_url']);