diff --git a/README.md b/README.md index 348858f..a000cf2 100644 --- a/README.md +++ b/README.md @@ -74,3 +74,5 @@ $ chown -R peertube:peertube /var/www/peertube ``` $ service peertube restart ``` + +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/check_process b/check_process index c56db6a..08c4b32 100644 --- a/check_process +++ b/check_process @@ -22,6 +22,8 @@ upgrade=1 from_commit=ed59a268e93910f8b35b0f87399f91b8cad9ede0 # 3.4.0~ynh1 upgrade=1 from_commit=83a06ca4c96ccd941b49647b3698db2c6b771b79 + # 4.0.0~ynh1 + upgrade=1 from_commit=7c2bb0bb6a91b6b957b734f684aa3d64da892f4c backup_restore=1 multi_instance=0 port_already_use=0 @@ -40,3 +42,5 @@ Notification=yes name=3.3.0~ynh3 ; commit=83a06ca4c96ccd941b49647b3698db2c6b771b79 name=3.4.0~ynh1 + ; commit=7c2bb0bb6a91b6b957b734f684aa3d64da892f4c + name=4.0.0~ynh1 diff --git a/conf/app.src b/conf/app.src index 70ce977..0f0bceb 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,6 @@ -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 -SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 7acd1e7..7315d8b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -26,9 +26,6 @@ location = /api/v1/videos/upload-resumable { } location / { - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } try_files /dev/null @api; @@ -122,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; @@ -201,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 ; - #rewrite ^/static/webseed/(.*)$ $cdn/videos/$1 redirect; - #rewrite ^/static/(.*)$ $cdn/$1 redirect; rewrite ^/static/webseed/(.*)$ /videos/$1 break; rewrite ^/static/(.*)$ /$1 break; diff --git a/conf/production.yaml b/conf/production.yaml index e850d5e..275c91f 100644 --- 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 @@ -50,7 +50,7 @@ redis: hostname: 'localhost' port: 6379 auth: null - db: 0 + db: __REDIS_DB__ # SMTP server to send emails smtp: @@ -69,13 +69,21 @@ smtp: email: body: - signature: "PeerTube" + signature: 'PeerTube' subject: - prefix: "[PeerTube]" + 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 # Used to configure the signup form 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 @@ -264,6 +336,7 @@ transcoding: resolutions: # Only created if the original video has a higher resolution, uses more storage! 0p: false # audio-only (creates mp4 without video stream, always created when enabled) + 144p: false 240p: false 360p: false 480p: false @@ -310,8 +383,17 @@ live: # Your firewall should accept traffic from this port in TCP if you enable live rtmp: + enabled: true 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 @@ -323,6 +405,7 @@ live: profile: 'default' resolutions: + 144p: false 240p: false 360p: false 480p: false @@ -340,13 +423,23 @@ 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' + # Path to the python binary to execute for youtube-dl or yt-dlp + python_path: '/usr/bin/python3' + # 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 +473,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 +513,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