From c597bb4d97850936a4a7f0df7f5c7c09f4de93a1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 21 Sep 2022 17:43:42 +0000 Subject: [PATCH 1/3] Upgrade to v4.3.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index d6868da..4a6b2e9 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v4.2.2/peertube-v4.2.2.tar.xz -SOURCE_SUM=4b9e36aaa86f2e0dfb1cb36ed894eaf853a024a9e9407d3a73751d0655999089 +SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v4.3.0/peertube-v4.3.0.tar.xz +SOURCE_SUM=d6d37ef0e071c85e3b28d9ada657ff684651a688bc4b7370cece3e9bebed4e71 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.xz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 8a020f9..054aea0 100644 --- 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": "4.2.2~ynh4", + "version": "4.3.0~ynh1", "url": "https://github.com/Chocobozzz/PeerTube", "upstream": { "license": "AGPL-3.0-only", From 98357a43aa2d1a590de28b9899469cfee4fcf7ce Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 21 Sep 2022 17:43:48 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 62d5b52..6c034b0 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser, using WebTorrent. -**Shipped version:** 4.2.2~ynh4 +**Shipped version:** 4.3.0~ynh1 **Demo:** http://peertube.cpy.re diff --git a/README_fr.md b/README_fr.md index f6452c7..380035f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Plateforme de streaming vidéo fédérée (ActivityPub) utilisant P2P (BitTorrent) directement dans le navigateur Web, en utilisant WebTorrent -**Version incluse :** 4.2.2~ynh4 +**Version incluse :** 4.3.0~ynh1 **Démo :** http://peertube.cpy.re From 861889d6c6987a5acefc74dfd81567b552e5d7d5 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 22 Sep 2022 20:18:23 +0200 Subject: [PATCH 3/3] Upgrade configuration --- conf/production.yaml | 79 +++++++++++++++++++++++++++++++++++++++----- manifest.json | 2 +- 2 files changed, 71 insertions(+), 10 deletions(-) diff --git a/conf/production.yaml b/conf/production.yaml index f24ee09..41614b7 100644 --- a/conf/production.yaml +++ b/conf/production.yaml @@ -25,6 +25,10 @@ rates_limit: # 3 attempts in 5 min window: 5 minutes max: 3 + receive_client_log: + # 10 attempts in 10 min + window: 10 minutes + max: 10 # Proxies to trust to get real client IP # If you run PeerTube just behind a local proxy (nginx), keep 'loopback' @@ -91,11 +95,13 @@ defaults: licence: null p2p: - # Enable P2P by default + # Enable P2P by default in PeerTube client # Can be enabled/disabled by anonymous users and logged in users webapp: enabled: true + # Enable P2P by default in PeerTube embed + # Can be enabled/disabled by URL option embed: enabled: true @@ -135,7 +141,7 @@ object_storage: region: 'us-east-1' # Set this ACL on each uploaded object - upload_acl: 'public' + upload_acl: 'public-read' credentials: # You can also use AWS_ACCESS_KEY_ID env variable @@ -164,14 +170,38 @@ object_storage: log: 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 max_file_size: 12MB max_files: 20 + anonymize_ip: false + log_ping_requests: true + log_tracker_unknown_infohash: true + prettify_sql: false + # Accept warn/error logs coming from the client + accept_client_log: true + +# Highly experimental support of Open Telemetry +open_telemetry: + metrics: + enabled: false + + # Create a prometheus exporter server on this port so prometheus server can scrape PeerTube metrics + prometheus_exporter: + port: 9091 + + tracing: + enabled: false + + # Send traces to a Jaeger compatible endpoint + jaeger_exporter: + endpoint: '' + trending: videos: interval_days: 7 # Compute trending videos for the last x days @@ -225,7 +255,7 @@ security: enabled: true tracker: - # If you disable the tracker, you disable the P2P aspect of PeerTube + # If you disable the tracker, you disable the P2P on your PeerTube instance enabled: true # Only handle requests on your videos # If you set this to false it means you have a public tracker @@ -292,15 +322,25 @@ webadmin: # Set this to false if you don't want to allow config edition in the web interface by instance admins allowed: true +# XML, Atom or JSON feeds +feeds: + videos: + # Default number of videos displayed in feeds + count: 20 + + comments: + # Default number of comments displayed in feeds + count: 20 + ############################################################################### # -# From this point, all the following keys can be overridden by the web interface +# From this point, almost all 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 # -# /!\ If you already have a local-production.json file, the modification of the -# following keys will have no effect /!\ +# /!\ If you already have a local-production.json file, modification of some of +# the following keys will have no effect /!\ # ############################################################################### @@ -373,11 +413,14 @@ transcoding: 1440p: false 2160p: false + # Transcode and keep original resolution, even if it's above your maximum enabled resolution + always_transcode_original_resolution: true + # Generate videos in a WebTorrent format (what we do since the first PeerTube release) # If you also enabled the hls format, it will multiply videos storage by 2 # If disabled, breaks federation with PeerTube instances < 2.1 webtorrent: - enabled: true + enabled: false # /!\ Requires ffmpeg >= 4.1 # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: @@ -386,7 +429,7 @@ transcoding: # * More stable playback (less bugs/infinite loading) # If you also enabled the webtorrent format, it will multiply videos storage by 2 hls: - enabled: false + enabled: true live: enabled: true @@ -466,6 +509,9 @@ live: 1440p: false 2160p: false + # Also transcode original resolution, even if it's above your maximum enabled resolution + always_transcode_original_resolution: true + video_studio: # Enable video edition by users (cut, add intro/outro, add watermark etc) # If enabled, users can create transcoding tasks as they wish @@ -477,6 +523,9 @@ import: # Amount of import jobs to execute in parallel concurrency: 1 + # Set a custom video import timeout to not block import queue + timeout: '2 hours' + # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html http: # We recommend to use a HTTP proxy if you enable HTTP import to prevent private URL access from this server @@ -489,9 +538,10 @@ import: # Examples: # * https://api.github.com/repos/ytdl-org/youtube-dl/releases # * https://api.github.com/repos/yt-dlp/yt-dlp/releases + # * https://yt-dl.org/downloads/latest/youtube-dl url: 'https://api.github.com/repos/yt-dlp/yt-dlp/releases' - # youtube-dl binary name + # Release binary name: 'yt-dlp' or 'youtube-dl' name: 'yt-dlp' # Path to the python binary to execute for youtube-dl or yt-dlp @@ -506,6 +556,17 @@ import: # See https://docs.joinpeertube.org/maintain-configuration?id=security for more information enabled: false + # Add ability for your users to synchronize their channels with external channels, playlists, etc. + video_channel_synchronization: + enabled: false + + max_per_user: 10 + + check_interval: 1 hour + + # Number of latest published videos to check and to potentially import when syncing a channel + videos_limit_per_synchronization: 10 + auto_blacklist: # New videos automatically blacklisted so moderators can review before publishing videos: diff --git a/manifest.json b/manifest.json index 054aea0..f319fdc 100644 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,7 @@ "name": "yalh76" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.0" }, "multi_instance": false, "services": [