Merge pull request #140 from YunoHost-Apps/testing

Upgrade to 2.1.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:** 2.0.0
+**Shipped version:** 2.1.0
 
 ## Important points to read before installing
 

check_process

@@ -17,7 +17,12 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1	from_commit=280ba0d4a9ebb9d8948e0db97200dbcb89b6c323
+		# 1.3.1
+		upgrade=1	from_commit=22ca62492ce32d22ac710758bca4e3be0534566c
+		# 1.4.1
+		upgrade=1	from_commit=33620aacc6f6e2ac003ae6bd2de57dc5d74a5343
+		# 2.0.0
+		upgrade=1	from_commit=032acd21b36030c9c1680d882d54c8011439e83c
 		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.

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v2.0.0/peertube-v2.0.0.tar.xz
-SOURCE_SUM=5a9e7b5f7ca8ee191060427e193a2182a56e86d5946094ebbc905a07b9b6b703
+SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v2.1.0/peertube-v2.1.0.tar.xz
+SOURCE_SUM=a71a87b8b4054cd5d668da9e6242dadf7938d3b810280a0afbba9e50bdb30c9b
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.xz
 SOURCE_IN_SUBDIR=true

conf/production.yaml

@@ -87,6 +87,9 @@ log:
   level: 'info' # debug/info/warning/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
 
 search:
 # Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance
@@ -217,18 +220,26 @@ transcoding:
   allow_audio_files: true
   threads: 1
   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)
     240p: false
     360p: false
     480p: false
     720p: false
     1080p: false
     2160p: false
+
+  # Generate videos in a WebTorrent format (what we do since the first PeerTube release)
+  # If you also enabled the hls format, it will multiply videos storage by 2
+  # If disabled, breaks federation with PeerTube instances < 2.1
+  webtorrent:
+    enabled: true
+
   # /!\ Requires ffmpeg >= 4.1
   # 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 /!\
+  # If you also enabled the webtorrent format, it will multiply videos storage by 2
   hls:
     enabled: false
     
@@ -237,6 +248,10 @@ import:
   videos:
     http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html
       enabled: 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
 
@@ -266,7 +281,7 @@ instance:
   # How long do you plan to maintain this instance?
   maintenance_lifetime: ''
 
-  # How will you pay the PeerTube instance server? With you own funds? With users donations? Advertising?
+  # How will you pay the PeerTube instance server? With your own funds? With users donations? Advertising?
   business_model: ''
 
   # If you want to explain on what type of hardware your PeerTube instance runs

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

scripts/upgrade

@@ -102,8 +102,11 @@ then
 	tmpdir="$(mktemp -d)"
 	
 	# Backup the config file in the temp dir
-	cp -a "$final_path/config/local-production.json" "$tmpdir/local-production.json"
 	cp -a "$final_path/config/production.yaml" "$tmpdir/production.yaml"
+	if [ -s "$final_path/config/local-production.json" ]
+	then
+		cp -a "$final_path/config/local-production.json" "$tmpdir/local-production.json"
+	fi
 	
 	# Remove the app directory securely
 	ynh_secure_remove --file="$final_path"