Merge pull request #289 from BDouze/v4.0.0

Update PeerTube to version 4.0.0
2024-09-03 19:56:29 +02:00 · 2021-12-24 08:58:02 +01:00 · 2021-12-24 08:58:02 +01:00 · d97d5ef381
commit d97d5ef381
parent b7ff32bf85 49718edbc0
8 changed files with 135 additions and 42 deletions
--- a/README.md
+++ b/README.md
@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in

 Video streaming platform using P2P directly in the web browser, connected to a federated network

-**Shipped version:** 3.4.1~ynh3
+**Shipped version:** 4.0.0~ynh1

 **Demo:** http://peertube.cpy.re

@ -77,4 +77,4 @@ or
 sudo yunohost app upgrade peertube -u https://github.com/YunoHost-Apps/peertube_ynh/tree/testing --debug
 ```

-**More info regarding app packaging:** https://yunohost.org/packaging_apps
+**More info regarding app packaging:** https://yunohost.org/packaging_apps
--- a/README_fr.md
+++ b/README_fr.md
@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour

 Plateforme de diffusion vidéo par P2P directement dans le navigateur, et connectée à un réseau fédéralisé

-**Version incluse :** 3.4.1~ynh3
+**Version incluse :** 4.0.0~ynh1

 **Démo :** http://peertube.cpy.re

@ -83,4 +83,4 @@ ou
 sudo yunohost app upgrade peertube -u https://github.com/YunoHost-Apps/peertube_ynh/tree/testing --debug
 ```

-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
--- a/conf/app.src
+++ b/conf/app.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v3.4.1/peertube-v3.4.1.tar.xz
-SOURCE_SUM=dd7357529826beb071a86e6f76bc2eb99b0d6481a71566db1cb2f6cf8a4a6305
+SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v4.0.0/peertube-v4.0.0.tar.xz
+SOURCE_SUM=afbc6ef1f950cb80fc1b61ef83e27ab25d2c7ec8f605e17bc59f8635848862da
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.xz
 SOURCE_IN_SUBDIR=true
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@ -119,7 +119,7 @@ tcp_nodelay               on; # don't buffer data sent, good for small data burs

 # Bypass PeerTube for performance reasons. Optional.
 # Should be consistent with client-overrides assets list in /server/controllers/client.ts
-location ~ ^/client/(assets/images/(icons/icon-36x36\.png|icons/icon-48x48\.png|icons/icon-72x72\.png|icons/icon-96x96\.png|icons/icon-144x144\.png|icons/icon-192x192\.png|icons/icon-512x512\.png|logo\.svg|favicon\.png))$ {
+location ~ ^/client/(assets/images/(icons/icon-36x36\.png|icons/icon-48x48\.png|icons/icon-72x72\.png|icons/icon-96x96\.png|icons/icon-144x144\.png|icons/icon-192x192\.png|icons/icon-512x512\.png|logo\.svg|favicon\.png|default-playlist\.jpg|default-avatar-account\.png|default-avatar-video-channel\.png))$ {
  more_set_headers "Cache-Control : public, max-age=31536000, immutable"; # Cache 1 year

  try_files __DATADIR__/client-overrides/$1 __FINALPATH__/client/dist/$1 @api;
@ -198,12 +198,6 @@ location ~ ^/static/(webseed|redundancy|streaming-playlists)/ {
  sendfile_max_chunk 1M; # prevent one fast connection from entirely occupying the worker process. should be > 800k.
  aio threads;

-  # Use this in tandem with fuse-mounting i.e. https://docs.joinpeertube.org/admin-remote-storage
-  # to serve files directly from a public bucket without proxying.
-  # Assumes you have buckets named after the storage subdirectories, i.e. 'videos', 'redundancy', etc.
-  #set $cdn <your S3-compatiable bucket public url mounted via fuse>;
-  #rewrite ^/static/webseed/(.*)$ $cdn/videos/$1 redirect;
-  #rewrite ^/static/(.*)$         $cdn/$1        redirect;
  rewrite ^/static/webseed/(.*)$ /videos/$1 break;
  rewrite ^/static/(.*)$         /$1        break;

--- a/conf/production.yaml
+++ b/conf/production.yaml
@ -32,7 +32,7 @@ rates_limit:
 trust_proxy:
  - 'loopback'

-# Your database name will be database.name OR "peertube"+database.suffix
+# Your database name will be database.name OR 'peertube'+database.suffix
 database:
  hostname: 'localhost'
  port: 5432
@ -73,9 +73,17 @@ email:
  subject:
    prefix: "[PeerTube]"

+# PeerTube client/interface configuration
+client:
+  videos:
+    miniature:
+      # By default PeerTube client displays author username
+      prefer_author_display_name: false
+
 # From the project root directory
 storage:
  tmp: '__DATADIR__/tmp/' # Use to download data (imports etc), store uploaded files before processing...
+  bin: '__DATADIR__/bin/'
  avatars: '__DATADIR__/avatars/'
  videos: '__DATADIR__/videos/'
  streaming_playlists: '__DATADIR__/streaming-playlists/'
@ -87,19 +95,58 @@ storage:
  captions: '__DATADIR__/captions/'
  cache: '__DATADIR__/cache/'
  plugins: '__DATADIR__/plugins/'
-  # Overridable client files : logo.svg, favicon.png and icons/*.png (PWA) in client/dist/assets/images
+  # Overridable client files in client/dist/assets/images:
+  # - logo.svg
+  # - favicon.png
+  # - default-playlist.jpg
+  # - default-avatar-account.png
+  # - default-avatar-video-channel.png
+  # - and icons/*.png (PWA)
  # Could contain for example assets/images/favicon.png
  # If the file exists, peertube will serve it
-  # If not, peertube will fallback to the default fil
+  # If not, peertube will fallback to the default file
  client_overrides: '__DATADIR__/client-overrides/'

+object_storage:
+  enabled: false
+
+  # Without protocol, will default to HTTPS
+  endpoint: '' # 's3.amazonaws.com' or 's3.fr-par.scw.cloud' for example
+
+  region: 'us-east-1'
+
+  credentials:
+    # You can also use AWS_ACCESS_KEY_ID env variable
+    access_key_id: ''
+    # You can also use AWS_SECRET_ACCESS_KEY env variable
+    secret_access_key: ''
+
+  # Maximum amount to upload in one request to object storage
+  max_upload_part: 2GB
+
+  streaming_playlists:
+    bucket_name: 'streaming-playlists'
+
+    # Allows setting all buckets to the same value but with a different prefix
+    prefix: '' # Example: 'streaming-playlists:'
+
+    # Base url for object URL generation, scheme and host will be replaced by this URL
+    # Useful when you want to use a CDN/external proxy
+    base_url: '' # Example: 'https://mirror.example.com'
+
+  # Same settings but for webtorrent videos
+  videos:
+    bucket_name: 'videos'
+    prefix: ''
+    base_url: ''
+
 log:
-  level: 'info' # debug/info/warning/error
+  level: 'info' # 'debug' | 'info' | 'warn' | 'error'
  rotation:
    enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate
-    maxFileSize: 12MB
-    maxFiles: 20
-  anonymizeIP: false
+    max_file_size: 12MB
+    max_files: 20
+  anonymize_ip: false
  log_ping_requests: true
  prettify_sql: false

@ -151,11 +198,16 @@ csp:
  report_only: true # CSP directives are still being tested, so disable the report only mode at your own risk!
  report_uri:

+security:
+  # Set the X-Frame-Options header to help to mitigate clickjacking attacks
+  frameguard:
+    enabled: true
+
 tracker:
  # If you disable the tracker, you disable the P2P aspect of PeerTube
  enabled: true
-  # Only handle requests on your videos.
-  # If you set this to false it means you have a public tracker.
+  # Only handle requests on your videos
+  # If you set this to false it means you have a public tracker
  # Then, it is possible that clients overload your instance with external torrents
  private: true
  # Reject peers that do a lot of announces (could improve privacy of TCP/UDP peers)
@ -178,6 +230,11 @@ views:
    remote:
      max_age: '30 days'

+    # PeerTube buffers local video views before updating and federating the video
+    local_buffer_update_interval: '30 minutes'
+
+    ip_view_expiration: '1 hour'
+
 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
@ -192,20 +249,30 @@ federation:

    # Add a weekly job that cleans up remote AP interactions on local videos (shares, rates and comments)
    # It removes objects that do not exist anymore, and potentially fix their URLs
-    # This setting is opt-in because due to an old bug in PeerTube, remote rates sent by instance before PeerTube 3.0 will be deleted
-    # We still suggest you to enable this setting even if your users will loose most of their video's likes/dislikes
-    cleanup_remote_interactions: false
+    cleanup_remote_interactions: true

+peertube:
+  check_latest_version:
+    # Check and notify admins of new PeerTube versions
+    enabled: false
+    # You can use a custom URL if your want, that respect the format behind https://joinpeertube.org/api/v1/versions.json
+    url: 'https://joinpeertube.org/api/v1/versions.json'
+
+webadmin:
+  configuration:
+    edition:
+      # Set this to false if you don't want to allow config edition in the web interface by instance admins
+      allowed: true

 ###############################################################################
 #
 # From this point, all the following keys can be overridden by the web interface
 # (local-production.json file). If you need to change some values, prefer to
 # use the web interface because the configuration will be automatically
-# reloaded without any need to restart PeerTube.
+# reloaded without any need to restart PeerTube
 #
 # /!\ If you already have a local-production.json file, the modification of the
-# following keys will have no effect /!\.
+# following keys will have no effect /!\
 #
 ###############################################################################

@ -228,6 +295,7 @@ contact_form:
 signup:
  enabled: false
  limit: 10 # When the limit is reached, registrations are disabled. -1 == unlimited
+  minimum_age: 16
  requires_email_verification: false
  filters:
    cidr: # You can specify CIDR ranges to whitelist (empty = no filtering) or blacklist
@ -235,13 +303,17 @@ signup:
      blacklist: []

 user:
-  # Default value of maximum video BYTES the user can upload (does not take into account transcoded files).
+  # Default value of maximum video bytes the user can upload (does not take into account transcoded files)
+  # Byte format is supported ("1GB" etc)
  # -1 == unlimited
  video_quota: -1
  video_quota_daily: -1

-# If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag
-# In addition, if some resolutions are enabled the mp4 video file will be transcoded to these new resolutions.
+video_channels:
+  max_per_user: 20 # Allows each user to create up to 20 video channels.
+
+# If enabled, the video will be transcoded to mp4 (x264) with `faststart` flag
+# In addition, if some resolutions are enabled the mp4 video file will be transcoded to these new resolutions
 # Please, do not disable transcoding since many uploaded videos will not work
 transcoding:
  enabled: true
@ -312,6 +384,14 @@ live:
  rtmp:
    port: 1935

+  rtmps:
+    enabled: false
+    port: 1936
+    # Absolute path
+    key_file: ''
+    # Absolute path
+    cert_file: ''
+
  # Allow to transcode the live streaming in multiple live resolutions
  transcoding:
    enabled: true
@ -340,13 +420,21 @@ import:
    http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html
      enabled: false

+      youtube_dl_release:
+        # Direct download URL to youtube-dl binary
+        # Github releases API is also supported
+        # Examples:
+        #   * https://api.github.com/repos/ytdl-org/youtube-dl/releases
+        #   * https://api.github.com/repos/yt-dlp/yt-dlp/releases
+        url: 'https://api.github.com/repos/yt-dlp/yt-dlp/releases'
+
+        # youtube-dl binary name
+        # yt-dlp is also supported
+        name: 'yt-dlp'
+
      # IPv6 is very strongly rate-limited on most sites supported by youtube-dl
      force_ipv4: false

-      # You can use an HTTP/HTTPS/SOCKS proxy with youtube-dl
-      proxy:
-        enabled: false
-        url: ""
    torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file)
      enabled: false

@ -380,7 +468,7 @@ instance:
  business_model: '' # Supports Markdown

  # If you want to explain on what type of hardware your PeerTube instance runs
-  # Example: "2 vCore, 2GB RAM..."
+  # Example: '2 vCore, 2GB RAM...'
  hardware_information: '' # Supports Markdown

  # What are the main languages of your instance? To interact with your users for example
@ -420,20 +508,20 @@ instance:
  # Enabling it will allow other administrators to know that you are mainly federating sensitive content
  # Moreover, the NSFW checkbox on video upload will be automatically checked by default
  is_nsfw: false
-  # By default, "do_not_list" or "blur" or "display" NSFW videos
+  # By default, `do_not_list` or `blur` or `display` NSFW videos
  # Could be overridden per user with a setting
  default_nsfw_policy: 'do_not_list'

  customizations:
    javascript: '' # Directly your JavaScript code (without <script> tags). Will be eval at runtime
    css: '' # Directly your CSS code (without <style> tags). Will be injected at runtime
-  # Robot.txt rules. To disallow robots to crawl your instance and disallow indexation of your site, add '/' to "Disallow:'
+  # Robot.txt rules. To disallow robots to crawl your instance and disallow indexation of your site, add `/` to `Disallow:`
  robots: |
    User-agent: *
    Disallow:
-  # Security.txt rules. To discourage researchers from testing your instance and disable security.txt integration, set this to an empty string.
+  # Security.txt rules. To discourage researchers from testing your instance and disable security.txt integration, set this to an empty string
  securitytxt:
-    "# If you would like to report a security issue\n# you may report it to:\nContact: https://github.com/Chocobozzz/PeerTube/blob/develop/SECURITY.md\nContact: mailto:"
+    '# If you would like to report a security issue\n# you may report it to:\nContact: https://github.com/Chocobozzz/PeerTube/blob/develop/SECURITY.md\nContact: mailto:'

 services:
  # Cards configuration to format video in Twitter
@ -441,7 +529,7 @@ services:
    username: '@yunohost' # Indicates the Twitter account for the website or platform on which the content was published
    # If true, a video player will be embedded in the Twitter feed on PeerTube video share
    # If false, we use an image link card that will redirect on your PeerTube instance
-    # Change it to "true", and then test on https://cards-dev.twitter.com/validator to see if you are whitelisted
+    # Change it to `true`, and then test on https://cards-dev.twitter.com/validator to see if you are whitelisted
    whitelisted: false

 followers:
--- a/conf/systemd.service
+++ b/conf/systemd.service
@ -23,7 +23,8 @@ Restart=always
 NoNewPrivileges=yes
 PrivateTmp=yes
 PrivateDevices=yes
-RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
+# RestrictAddressFamilies is causing peeertube to fail with error "uv_interface_addresses returned Unknown system error 97"
+# RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
 RestrictNamespaces=yes
 RestrictRealtime=yes
 DevicePolicy=closed
--- a/manifest.json
+++ b/manifest.json
@ -6,7 +6,7 @@
        "en": "Video streaming platform using P2P directly in the web browser, connected to a federated network",
        "fr": "Plateforme de diffusion vidéo par P2P directement dans le navigateur, et connectée à un réseau fédéralisé"
    },
-    "version": "3.4.1~ynh3",
+    "version": "4.0.0~ynh1",
    "url": "https://github.com/Chocobozzz/PeerTube",
    "upstream": {
        "license": "AGPL-3.0-only",
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -286,6 +286,16 @@ ynh_script_progression --message="Reloading NGINX web server..."

 ynh_systemd_action --service_name=nginx --action=reload

+
+#=================================================
+# PEERTUBE 4.0.0 UPGRADE MIGRATION SCRIPT
+#=================================================
+ynh_script_progression --message="Running Peertube 4.0.0 migration script..."
+
+pushd "$final_path"
+        ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH NODE_CONFIG_DIR="$final_path/config" NODE_ENV=production node dist/scripts/migrations/peertube-4.0.js
+popd
+
 #=================================================
 # END OF SCRIPT
 #=================================================