Update nginx config according to upstream

CHANGELOG.md

@@ -311,3 +311,9 @@ Update web browsers support list:
 * [Full changelog](https://github.com/Chocobozzz/PeerTube/releases/tag/v6.0.4)
 * Important: Prevent XSS injection in embed. Thanks Syst3m0ver!
 
+[2.16.0]
+* Update PeerTube to 6.1.0
+* [Full changelog](https://github.com/Chocobozzz/PeerTube/releases/tag/v6.1.0)
+* Compact ActivityPub JSON-LD objects before using them to prevent incorrect access control @tesaguri
+* Protect ActivityPub information related to private/internal/blocked videos
+

CloudronManifest.json

@@ -1,6 +1,6 @@
 {
-  "version": "2.15.2",
+  "version": "2.16.0",
-  "upstreamVersion": "6.0.4",
+  "upstreamVersion": "6.1.0",
   "id": "org.joinpeertube.cloudronapp",
   "title": "PeerTube",
   "author": "PeerTube developers",

Dockerfile

@@ -5,7 +5,7 @@ WORKDIR /app/code/server
 
 RUN apt update && apt install -y prosody && rm -rf /var/cache/apt /var/lib/apt/lists
 
-ARG VERSION=6.0.4
+ARG VERSION=6.1.0
 
 # install peertube. the chown is required for some reason for ffmpeg. it fails with EROFS without it when transcoding
 RUN curl -sL https://github.com/Chocobozzz/PeerTube/releases/download/v${VERSION}/peertube-v${VERSION}.tar.xz | tar --strip-components 1 -Jxvf - && \

nginx/peertube.conf

@@ -36,6 +36,13 @@ server {
     try_files /dev/null @api;
   }
 
+  location ~ ^/api/v1/users/[^/]+/imports/import-resumable$ {
+    client_max_body_size    0;
+    proxy_request_buffering off;
+
+    try_files /dev/null @api;
+  }
+
   location ~ ^/api/v1/videos/(upload|([^/]+/studio/edit))$ {
     limit_except POST HEAD { deny all; }
 

start.sh

@@ -110,6 +110,9 @@ update_config() {
     yq eval "del(.storage.videos)" -i /app/data/production.yaml
     yq eval "del(.transcoding.webtorrent)" -i /app/data/production.yaml
     yq eval ".transcoding.web_videos.enabled = true" -i /app/data/production.yaml
+
+    # changes for 6.1.0
+    yq eval ".storage.original_video_files = \"/app/data/storage/original_video_files/\"" -i /app/data/production.yaml
 }
 
 echo "==> Changing ownership"

test/package-lock.json

@@ -9,9 +9,9 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "chromedriver": "^123.0.1",
+        "chromedriver": "^124.0.1",
         "safetydance": "^2.4.0",
-        "selenium-webdriver": "^4.19.0"
+        "selenium-webdriver": "^4.20.0"
       },
       "devDependencies": {
         "expect.js": "^0.3.1",
@@ -258,9 +258,9 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "123.0.1",
+      "version": "124.0.1",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-123.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-124.0.1.tgz",
-      "integrity": "sha512-YQUIP/zdlzDIRCZNCv6rEVDSY4RAxo/tDL0OiGPPuai+z8unRNqJr/9V6XTBypVFyDheXNalKt9QxEqdMPuLAQ==",
+      "integrity": "sha512-hxd1tpAUhgMFBZd1h3W7KyMckxofOYCuKAMtcvBDAU0YKKorZcWuq6zP06+Ph0Z1ynPjtgAj0hP9VphCwesjZw==",
       "hasInstallScript": true,
       "dependencies": {
         "@testim/chrome-version": "^1.1.4",
@@ -1273,9 +1273,9 @@
       ]
     },
     "node_modules/selenium-webdriver": {
-      "version": "4.19.0",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.19.0.tgz",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.20.0.tgz",
-      "integrity": "sha512-8XHW8m9V2XN2/SC1kr4bWzMtGvjmKUEZ6S0UBoDBqonhmwEIzKOLbzhanBd08HCOg1s1O0XrDWCD71NnA8Zt0g==",
+      "integrity": "sha512-s/G44lGQ1xB3tmtX6NNPomlkpL6CxLdmAvp/AGWWwi4qv5Te1+qji7tPSyr6gyuoPpdYiof1rKnWe3luy0MrYA==",
       "dependencies": {
         "jszip": "^3.10.1",
         "tmp": "^0.2.3",
@@ -1782,9 +1782,9 @@
       }
     },
     "chromedriver": {
-      "version": "123.0.1",
+      "version": "124.0.1",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-123.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-124.0.1.tgz",
-      "integrity": "sha512-YQUIP/zdlzDIRCZNCv6rEVDSY4RAxo/tDL0OiGPPuai+z8unRNqJr/9V6XTBypVFyDheXNalKt9QxEqdMPuLAQ==",
+      "integrity": "sha512-hxd1tpAUhgMFBZd1h3W7KyMckxofOYCuKAMtcvBDAU0YKKorZcWuq6zP06+Ph0Z1ynPjtgAj0hP9VphCwesjZw==",
       "requires": {
         "@testim/chrome-version": "^1.1.4",
         "axios": "^1.6.7",
@@ -2520,9 +2520,9 @@
       "integrity": "sha512-KsQJ5xpuv05yeLVMP6FTp8PNtj/iY5MxmirU2Bb6lf5EvKkZFr3Qrx9umV9/NrAvRfin8mhotJNAnBD3C3MUkw=="
     },
     "selenium-webdriver": {
-      "version": "4.19.0",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.19.0.tgz",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.20.0.tgz",
-      "integrity": "sha512-8XHW8m9V2XN2/SC1kr4bWzMtGvjmKUEZ6S0UBoDBqonhmwEIzKOLbzhanBd08HCOg1s1O0XrDWCD71NnA8Zt0g==",
+      "integrity": "sha512-s/G44lGQ1xB3tmtX6NNPomlkpL6CxLdmAvp/AGWWwi4qv5Te1+qji7tPSyr6gyuoPpdYiof1rKnWe3luy0MrYA==",
       "requires": {
         "jszip": "^3.10.1",
         "tmp": "^0.2.3",

test/package.json

@@ -13,8 +13,8 @@
     "mocha": "^10.4.0"
   },
   "dependencies": {
-    "chromedriver": "^123.0.1",
+    "chromedriver": "^124.0.1",
     "safetydance": "^2.4.0",
-    "selenium-webdriver": "^4.19.0"
+    "selenium-webdriver": "^4.20.0"
   }
 }