diff --git a/README.md b/README.md index e5a1da7..2e950da 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ [![Install Peertube with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=Peertube)

======= -**Version 1.0.0-beta.4** +**Version v1.0.0-beta.6** -

+

PeerTube is a decentralized video streaming platform using P2P (BitTorrent) directly in the web browser, using WebTorrent.

diff --git a/conf/app.src b/conf/app.src index 364a9f2..d27a04a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v1.0.0-beta.4/peertube-v1.0.0-beta.4.tar.xz -SOURCE_SUM=900e91a0585814d96982c10080644a4cdc0234de9730bf553c5a1e01f75b8e85 +SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v1.0.0-beta.6/peertube-v1.0.0-beta.6.tar.xz +SOURCE_SUM=9a419a37a8c576a1979a79e6bf0dc9a19fc922f0ad87877a6e24196817e6e4a7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.xz SOURCE_IN_SUBDIR=true diff --git a/conf/production.yaml b/conf/production.yaml index be867e7..e71689e 100644 --- a/conf/production.yaml +++ b/conf/production.yaml @@ -75,6 +75,10 @@ admin: signup: enabled: false limit: 10 # When the limit is reached, registrations are disabled. -1 == unlimited + filters: + cidr: # You can specify CIDR ranges to whitelist (empty = no filtering) or blacklist + whitelist: [] + blacklist: [] user: # Default value of maximum video BYTES the user can upload (does not take into account transcoded files). @@ -85,7 +89,7 @@ user: # Uses a lot of CPU! transcoding: enabled: false - threads: 2 + threads: 1 resolutions: # Only created if the original video has a higher resolution 240p: false 360p: false @@ -106,3 +110,16 @@ instance: customizations: javascript: '' # Directly your JavaScript code (without