2 files changed, 48 insertions(+), 5 deletions(-)

M roles/peertube/files/peertube.conf
M roles/peertube/templates/production.yaml.j2

@@ 37,7 37,7 @@ server {
         try_files /dev/null @api;
     }
 
-    location = /api/v1/videos/upload {
+    location ~ ^/api/v1/videos/(upload|([^/]+/studio/edit))$ {
         limit_except POST HEAD {
             deny all;
         }

@@ 45,7 45,7 @@ database:
 
 # Redis server for short time storage
 # You can also specify a 'socket' path to a unix socket but first need to
-# comment out hostname and port
+# set 'hostname' and 'port' to null
 redis:
   hostname: "localhost"
   port: 6379


@@ 134,6 134,9 @@ object_storage:
 
   region: "us-east-1"
 
+  # Set this ACL on each uploaded object
+  upload_acl: "public"
+
   credentials:
     # You can also use AWS_ACCESS_KEY_ID env variable
     access_key_id: "{{ peertube_secrets['s3_access'] }}"


@@ 174,7 177,6 @@ trending:
     interval_days: 7 # Compute trending videos for the last x days
     algorithms:
       enabled:
-        - "best" # adaptation of Reddit's 'Best' algorithm (Hot minus History)
         - "hot" # adaptation of Reddit's 'Hot' algorithm
         - "most-viewed" # default, used initially by PeerTube as the trending page
         - "most-liked"


@@ 254,6 256,13 @@ views:
 
     ip_view_expiration: "1 hour"
 
+# Used to get country location of views of local videos
+geo_ip:
+  enabled: true
+
+  country:
+    database_url: "https://dbip.mirror.framasoft.org/files/dbip-country-lite-latest.mmdb"
+
 plugins:
   # The website PeerTube will ask for available PeerTube plugins and themes
   # This is an unmoderated plugin index, so only install plugins/themes you trust


@@ 400,19 409,43 @@ live:
   # /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay
   allow_replay: true
 
+  # Allow your users to change latency settings (small latency/default/high latency)
+  # Small latency live streams cannot use P2P
+  # High latency live streams can increase P2P ratio
+  latency_setting:
+    enabled: true
+
   # Your firewall should accept traffic from this port in TCP if you enable live
   rtmp:
     enabled: true
+
+    # Listening hostname/port for RTMP server
+    # '::' to listen on IPv6 and IPv4, '0.0.0.0' to listen on IPv4
+    # Use null to automatically listen on '::' if IPv6 is available, or '0.0.0.0' otherwise
+    hostname: null
     port: 1935
 
+    # Public hostname of your RTMP server
+    # Use null to use the same value than `webserver.hostname`
+    public_hostname: null
+
   rtmps:
     enabled: false
+
+    # Listening hostname/port for RTMPS server
+    # '::' to listen on IPv6 and IPv4, '0.0.0.0' to listen on IPv4
+    # Use null to automatically listen on '::' if IPv6 is available, or '0.0.0.0' otherwise
+    hostname: null
     port: 1936
-    # Absolute path
+
+    # Absolute paths
     key_file: ""
-    # Absolute path
     cert_file: ""
 
+    # Public hostname of your RTMPS server
+    # Use null to use the same value than `webserver.hostname`
+    public_hostname: null
+
   # Allow to transcode the live streaming in multiple live resolutions
   transcoding:
     enabled: true


@@ 433,6 466,11 @@ live:
       1440p: false
       2160p: false
 
+video_studio:
+  # Enable video edition by users (cut, add intro/outro, add watermark etc)
+  # If enabled, users can create transcoding tasks as they wish
+  enabled: true
+
 import:
   # Add ability for your users to import remote videos (from YouTube, torrent...)
   videos:


@@ 625,6 663,11 @@ client:
     miniature:
       # By default PeerTube client displays author username
       prefer_author_display_name: false
+      display_author_avatar: false
+    resumable_upload:
+      # Max size of upload chunks, e.g. '90MB'
+      # If null, it will be calculated based on network speed
+      max_chunk_size: null
 
   menu:
     login: