upgrade to 1.3.0

README.md

@@ -22,7 +22,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:** 1.2.1
+**Shipped version:** 1.3.0
 
 ## Screenshots
 

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v1.2.1/peertube-v1.2.1.tar.xz
+SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v1.3.0/peertube-v1.3.0.tar.xz
-SOURCE_SUM=77517c06133704e36b755bdae4f68838221e657ca70a1a40d5c8652655978ed5
+SOURCE_SUM=651789564bb4238c00f826bbe1e5b1dca9c13b9aaf4a87b922e0b7af5ebb8b77
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.xz
 SOURCE_IN_SUBDIR=true

conf/production.yaml

@@ -8,13 +8,22 @@ webserver:
   hostname: '__domain__'
   port: 443
 
+rates_limit:
+  login:
+    # 15 attempts in 5 min
+    window: 5 minutes
+    max: 15
+  ask_send_email:
+    # 3 attempts in 5 min
+    window: 5 minutes
+    max: 3
+
 # Proxies to trust to get real client IP
 # If you run PeerTube just behind a local proxy (nginx), keep 'loopback'
 # If you run PeerTube behind a remote proxy, add the proxy IP address (or subnet)
 trust_proxy:
   - 'loopback'
 
-
 # Your database name will be "peertube"+database.suffix
 database:
   hostname: 'localhost'
@@ -43,13 +52,14 @@ smtp:
   tls: false # If you use StartTLS: false
   disable_starttls: true
   ca_file: null # Used for self signed certificates
-  from_address: 'admin@__domain__'
+  from_address: 'webmaster@__domain__'
   
 # From the project root directory
 storage:
   tmp: '/home/yunohost.app/__app__/storage/tmp/' # Used to download data (imports etc), store uploaded files before processing...
   avatars: '/home/yunohost.app/__app__/storage/avatars/'
   videos: '/home/yunohost.app/__app__/storage/videos/'
+  streaming_playlists: '/home/yunohost.app/__app__/storage/streaming-playlists/'
   redundancy: '/home/yunohost.app/__app__/storage/videos/'
   logs: '/home/yunohost.app/__app__/storage/logs/'
   previews: '/home/yunohost.app/__app__/storage/previews/'
@@ -76,23 +86,60 @@ trending:
 # 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
-#redundancy:
+redundancy:
-#  videos:
+  videos:
-#    check_interval: '6 hour' # How often you want to check new videos to cache
+    check_interval: '6 hour' # How often you want to check new videos to cache
-#    strategies:
+    strategies:
 #    -
 #      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: '1GB'
+#        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
 
+csp:
+  enabled: false
+  report_only: true # CSP directives are still being tested, so disable the report only mode at your own risk!
+  report_uri:
+
+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.
+  # 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)
+  reject_too_many_announces: false
+
+history:
+  videos:
+    # If you want to limit users videos history
+    # -1 means there is no limitations
+    # Other values could be '6 months' or '30 days' etc (PeerTube will periodically delete old entries from database)
+    max_age: -1
+
+views:
+  videos:
+    # PeerTube creates a database entry every hour for each video to track views over a period of time
+    # This is used in particular by the Trending page
+    # PeerTube could remove old remote video views if you want to reduce your database size (video view counter will not be altered)
+    # -1 means no cleanup
+    # Other values could be '6 months' or '30 days' etc (PeerTube will periodically delete old entries from database)
+    remote:
+      max_age: -1
+
+
 ###############################################################################
 #
 # From this point, all the following keys can be overridden by the web interface
@@ -111,7 +158,6 @@ 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
@@ -142,6 +188,8 @@ transcoding:
   enabled: true
   # Allow your users to upload .mkv, .mov, .avi, .flv videos
   allow_additional_extensions: true
+  # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file
+  allow_audio_files: true
   threads: 1
   resolutions: # Only created if the original video has a higher resolution, uses more storage!
     240p: false
@@ -149,6 +197,15 @@ transcoding:
     480p: false
     720p: false
     1080p: false
+  # /!\ EXPERIMENTAL /!\
+  # /!\ Requires ffmpeg >= 4
+  # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent:
+  #     * Resolution change is smoother
+  #     * Faster playback in particular with long videos
+  #     * More stable playback (less bugs/infinite loading)
+  # /!\ Multiplies videos storage by 2 /!\
+  hls:
+    enabled: false
     
 import:
   # Add ability for your users to import remote videos (from YouTube, torrent...)
@@ -158,6 +215,12 @@ import:
     torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file)
       enabled: false
 
+auto_blacklist:
+  # New videos automatically blacklisted so moderators can review before publishing
+  videos:
+    of_users:
+      enabled: false
+
 # Instance settings
 instance:
   name: 'YunoHost PeerTube'
@@ -165,6 +228,10 @@ instance:
   description: '' # Support markdown
   terms: '' # Support markdown
   default_client_route: '/videos/trending'
+  # Whether or not the instance is dedicated to NSFW content
+  # 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
   # Could be overridden per user with a setting
   default_nsfw_policy: 'do_not_list'
@@ -189,3 +256,10 @@ services:
     # If false, we use an image link card that will redirect on your PeerTube instance
     # Test on https://cards-dev.twitter.com/validator to see if you are whitelisted
     whitelisted: false
+
+followers:
+  instance:
+    # Allow or not other instances to follow yours
+    enabled: true
+    # Whether or not an administrator must manually validate a new follower
+    manual_approval: false

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": "1.2.1~ynh1",
+    "version": "1.3.0~ynh1",
     "url": "https://github.com/Chocobozzz/PeerTube",
     "license": "AGPL-3.0-only",
     "maintainer": [

scripts/install

@@ -16,7 +16,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 
 ynh_clean_setup () {
-	read-p "key"
 	ynh_clean_check_starting
 }
 # Exit if an error occurs during the execution of the script