diff --git a/README.md b/README.md index b46bc9c..8404bdc 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Servers are run independently by different people and organizations. They can ap By watching a video, you help the hosting provider to broadcast it by becoming a broadcaster of the video yourself. Each instance doesn’t need much money to broadcast the videos of its users. -**Shipped version:** 2.2.0 +**Shipped version:** 2.3.0 ## Important points to read before installing diff --git a/check_process b/check_process index 025ab85..f81f2e0 100644 --- a/check_process +++ b/check_process @@ -17,12 +17,12 @@ setup_private=1 setup_public=1 upgrade=1 - # 2.0.0 - upgrade=1 from_commit=032acd21b36030c9c1680d882d54c8011439e83c # 2.1.0 upgrade=1 from_commit=d049b71061d12ffab92bbf106af200e7d8a69572 # 2.1.1~ynh1 upgrade=1 from_commit=63f076db215f8f438dbdcd2966c12d9ee7976121 + # 2.2.0~ynh1 + upgrade=1 from_commit=2b24ab443dc95fc78654e8232351933491cf04b4 backup_restore=1 multi_instance=1 # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. @@ -36,9 +36,9 @@ Email=anmol@datamol.org;yalh@yahoo.com Notification=yes ;;; Upgrade options - ; commit=032acd21b36030c9c1680d882d54c8011439e83c - name=2.0.0 ; commit=d049b71061d12ffab92bbf106af200e7d8a69572 name=2.1.0 ; commit=63f076db215f8f438dbdcd2966c12d9ee7976121 name=2.1.1~ynh1 + ; commit=2b24ab443dc95fc78654e8232351933491cf04b4 + name=2.2.0~ynh1 diff --git a/conf/app.src b/conf/app.src index 219148e..ae11e2d 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v2.2.0/peertube-v2.2.0.tar.xz -SOURCE_SUM=eca2c735f73b16404317b42600037e01b3e7ba15c975d3796855db096114c69b +SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v2.3.0/peertube-v2.3.0.tar.xz +SOURCE_SUM=ebab03ac28b9a22a3ba5868964678e8a30815479a83733c959c79587dbeed787 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.xz SOURCE_IN_SUBDIR=true diff --git a/conf/production.yaml b/conf/production.yaml index 62dbfb3..5dab156 100644 --- a/conf/production.yaml +++ b/conf/production.yaml @@ -32,7 +32,7 @@ rates_limit: trust_proxy: - 'loopback' -# Your database name will be "peertube"+database.suffix +# Your database name will be database.name OR "peertube"+database.suffix database: hostname: 'localhost' port: 5432 @@ -50,7 +50,7 @@ redis: port: 6379 auth: null db: 0 - + # SMTP server to send emails smtp: hostname: 'localhost' @@ -67,7 +67,7 @@ email: signature: "PeerTube" subject: prefix: "[PeerTube]" - + # From the project root directory storage: tmp: '/home/yunohost.app/__APP__/storage/tmp/' # Use to download data (imports etc), store uploaded files before processing... @@ -91,18 +91,10 @@ log: maxFiles: 20 anonymizeIP: false -search: -# Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance -# If enabled, the associated group will be able to "escape" from the instance follows -# That means they will be able to follow channels, watch videos, list videos of non followed instances - remote_uri: - users: true - anonymous: false - trending: videos: interval_days: 7 # Compute trending videos for the last x days - + # Cache remote videos on your server, to help other instances to broadcast the video # You can define multiple caches using different sizes/strategies # Once you have defined your strategies, choose which instances you want to cache in admin -> manage follows -> following @@ -110,22 +102,30 @@ redundancy: videos: check_interval: '1 hour' # How often you want to check new videos to cache strategies: # Just uncomment strategies you want -# - -# size: '10GB' -# # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances) -# min_lifetime: '48 hours' -# strategy: 'most-views' # Cache videos that have the most views -# - -# size: '10GB' -# # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances) -# min_lifetime: '48 hours' -# strategy: 'trending' # Cache trending videos -# - +# - # size: '10GB' -# # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances) -# min_lifetime: '48 hours' -# strategy: 'recently-added' # Cache recently added videos -# min_views: 10 # Having at least x views +# # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances) +# min_lifetime: '48 hours' +# strategy: 'most-views' # Cache videos that have the most views +# - +# size: '10GB' +# # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances) +# min_lifetime: '48 hours' +# strategy: 'trending' # Cache trending videos +# - +# size: '10GB' +# # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances) +# min_lifetime: '48 hours' +# strategy: 'recently-added' # Cache recently added videos +# min_views: 10 # Having at least x views + +# Other instances that duplicate your content +remote_redundancy: + videos: + # 'nobody': Do not accept remote redundancies + # 'anybody': Accept remote redundancies from anybody + # 'followings': Accept redundancies from instance followings + accept_from: 'anybody' csp: enabled: false @@ -167,6 +167,10 @@ plugins: check_latest_versions_interval: '12 hours' # How often you want to check new plugins/themes versions url: 'https://packages.joinpeertube.org' +federation: + videos: + federate_unlisted: true + ############################################################################### # @@ -185,7 +189,7 @@ cache: size: 500 # Max number of previews you want to cache captions: size: 500 # Max number of video captions/subtitles you want to cache - + admin: # Used to generate the root user at first startup # And to receive emails from the contact form @@ -198,7 +202,7 @@ signup: enabled: false limit: 10 # When the limit is reached, registrations are disabled. -1 == unlimited requires_email_verification: false - filters: + filters: cidr: # You can specify CIDR ranges to whitelist (empty = no filtering) or blacklist whitelist: [] blacklist: [] @@ -208,7 +212,7 @@ user: # -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. # Please, do not disable transcoding since many uploaded videos will not work @@ -242,7 +246,7 @@ transcoding: # If you also enabled the webtorrent format, it will multiply videos storage by 2 hls: enabled: false - + import: # Add ability for your users to import remote videos (from YouTube, torrent...) videos: @@ -335,7 +339,7 @@ instance: # Robot.txt rules. To disallow robots to crawl your instance and disallow indexation of your site, add '/' to "Disallow:' robots: | User-agent: * - Disallow: + Disallow: # 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:" @@ -369,7 +373,39 @@ followings: # /!\ Don't enable this if you don't have a reactive moderation team /!\ auto_follow_index: enabled: false + # Host your own using https://framagit.org/framasoft/peertube/instances-peertube#peertube-auto-follow index_url: 'https://instances.joinpeertube.org' theme: default: 'default' + +broadcast_message: + enabled: false + message: '' # Support markdown + level: 'info' # 'info' | 'warning' | 'error' + dismissable: false + +search: + # Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance + # If enabled, the associated group will be able to "escape" from the instance follows + # That means they will be able to follow channels, watch videos, list videos of non followed instances + remote_uri: + users: true + anonymous: false + + # Use a third party index instead of your local index, only for search results + # Useful to discover content outside of your instance + # If you enable search_index, you must enable remote_uri search for users + # If you do not enable remote_uri search for anonymous user, your instance will redirect the user on the origin instance + # instead of loading the video locally + search_index: + enabled: false + # URL of the search index, that should use the same search API and routes + # than PeerTube: https://docs.joinpeertube.org/api-rest-reference.html + # You should deploy your own with https://framagit.org/framasoft/peertube/search-index, + # and can use https://search.joinpeertube.org/ for tests, but keep in mind the latter is an unmoderated search index + url: '' + # You can disable local search, so users only use the search index + disable_local_search: false + # If you did not disable local search, you can decide to use the search index by default + is_default_search: false diff --git a/manifest.json b/manifest.json index 8b99512..894a693 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": "2.2.0~ynh1", + "version": "2.3.0~ynh1", "url": "https://github.com/Chocobozzz/PeerTube", "license": "AGPL-3.0-only", "maintainer": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 9ed0f6d..03fa0ab 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app pkg_dependencies="ffmpeg postgresql postgresql-contrib openssl g++ redis-server redis-tools mailutils apt-transport-https" -YNH_NODEJS_VERSION=10 +YNH_NODEJS_VERSION=12 #================================================= # PERSONAL HELPERS