diff --git a/README.md b/README.md
index 5606cda..e2a12b0 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
[](https://install-app.yunohost.org/?app=peertube)
=======
-Shipped Version: **1.0.0-beta.10**
+Shipped Version: **1.0.0-beta.11**
## What is Peertube ?
diff --git a/conf/app.src b/conf/app.src
index 9f6a499..20e02d7 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.10/peertube-v1.0.0-beta.10.tar.xz
-SOURCE_SUM=e4f724f687e0d40b0db8f7225e5cf589cc18db685609f1c030331027f3394e0c
+SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v1.0.0-beta.11/peertube-v1.0.0-beta.11.tar.xz
+SOURCE_SUM=906a366888621211901419de5951fe03677fc5aa1a02a4f9543950e92addfc65
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.xz
SOURCE_IN_SUBDIR=true
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 57fc53a..18bcbec 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -2,9 +2,9 @@
add_header Cache-Control "public, max-age=31536000, immutable";
alias __FINALPATH__/client/dist/$1;
- }
+ }
- location ~ ^/static/(thumbnails|avatars)/ {
+ location ~ ^/static/(thumbnails|avatars)/ {
if ($request_method = 'OPTIONS') {
add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS';
diff --git a/conf/production.yaml b/conf/production.yaml
index d1e2788..08305ce 100644
--- a/conf/production.yaml
+++ b/conf/production.yaml
@@ -22,8 +22,12 @@ database:
suffix: '___db_name__'
username: '__db_name__'
password: '__db_pwd__'
+pool:
+ max: 5
-# Your object store
+# Redis server for short time storage
+# You can also specify a 'socket' path to a unix socket but first need to
+# comment out hostname and port
redis:
hostname: 'localhost'
port: 6379
@@ -33,10 +37,10 @@ redis:
# SMTP server to send emails
smtp:
hostname: 'localhost'
- port: 25
+ port: 25 # If you use StartTLS: 587
username: null
password: null
- tls: false
+ tls: false # If you use StartTLS: false
disable_starttls: true
ca_file: null # Used for self signed certificates
from_address: 'admin@__domain__'
@@ -57,7 +61,7 @@ log:
###############################################################################
#
-# From this point, all the following keys can be overriden by the web interface
+# 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.
@@ -102,6 +106,14 @@ transcoding:
480p: false
720p: false
1080p: false
+
+import:
+ # Add ability for your users to import remote videos (from YouTube, torrent...)
+ videos:
+ http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html
+ enabled: false
+ torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file)
+ enabled: false
# Instance settings
instance:
diff --git a/manifest.json b/manifest.json
index 1ec17d4..8b539f5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,7 +5,7 @@
"description": {
"en": "Video streaming platform using P2P directly in the web browser, connected to a federated network"
},
- "version": "1.0.0-beta.10",
+ "version": "v1.0.0-beta.11",
"url": "https://github.com/Chocobozzz/PeerTube",
"license": "AGPL-3.0-only",
"maintainer": {