chore: publish 8.4.1+v8.3.1-trixie release

Reviewed-on: #23

.drone.yml

@@ -35,7 +35,7 @@ steps:
         from_secret: drone_abra-bot_token
       fork: true
       repositories:
-        - coop-cloud/auto-recipes-catalogue-json
+        - toolshed/auto-recipes-catalogue-json
 
 trigger:
   event: tag

.env.sample

@@ -2,6 +2,7 @@ TYPE=peertube
 
 DOMAIN=peertube.example.com              # <= EDIT THIS
 LETS_ENCRYPT_ENV=production
+COMPOSE_FILE=compose.yml
 
 PEERTUBE_WEBSERVER_PORT=443
 PEERTUBE_WEBSERVER_HTTPS=true
@@ -12,6 +13,10 @@ PEERTUBE_CONTACT_FORM_ENABLED=false
 
 SECRET_DB_PASSWORD_VERSION=v1
 
+# Comment out these lines if you want to store the peertube secret in a config file instead of a docker secret
+COMPOSE_FILE="$COMPOSE_FILE:compose.peertube-secret.yml"
+SECRET_PEERTUBE_SECRET_VERSION=v1 # length=32
+
 ## Webseed backend
 #
 #  If no NGINX_WEBSEED option is enabled, videos will be served
@@ -30,7 +35,7 @@ SECRET_DB_PASSWORD_VERSION=v1
 #NGINX_WEBSEED_CDN_URI=https://some-bucket.some-cdn.net
 
 ## E-mail settings                            # <= EDIT ALL THIS
-#COMPOSE_FILE="compose.yml:compose.smtp.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
 #PEERTUBE_SMTP_ENABLED=1
 #SECRET_SMTP_PASSWORD_VERSION=v1
 #PEERTUBE_SMTP_USERNAME=foobar
@@ -41,7 +46,7 @@ SECRET_DB_PASSWORD_VERSION=v1
 #PEERTUBE_SMTP_DISABLE_STARTTLS=true
 
 ## Live stream settings
-#COMPOSE_FILE="compose.yml:compose.rtmp.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.rtmp.yml"
 
 ## Live chat settings
 #PEERTUBE_LIVE_CHAT_ENABLED=1

README.md

@@ -20,12 +20,11 @@ An ActivityPub-federated video streaming platform using P2P directly in your web
 
 1. Set up Docker Swarm and [`abra`]
 2. Deploy [`coop-cloud/traefik`]
-3. `abra app new peertube --secrets` (optionally with `--pass` if you'd like
-   to save secrets in `pass`)
-4. `abra app config YOURAPPDOMAIN` - be sure to change `DOMAIN` to something that resolves to
-   your Docker swarm box
-5. `abra app deploy YOURAPPDOMAIN`
-6. Open the configured domain in your browser to finish set-up
+3. `abra app new peertube`
+4. `abra app secret generate YOURAPPDOMAIN -a`
+5. `abra app config YOURAPPDOMAIN` - be sure to change `DOMAIN` to something that resolves to your Docker swarm box
+6. `abra app deploy YOURAPPDOMAIN`
+7. Open the configured domain in your browser to finish set-up
 
 ## Host-mode networking
 

abra.sh

@@ -1,7 +1,7 @@
 # shellcheck disable=SC2034,SC2145
 
-export NGINX_CONFIG_VERSION=v4
-export APP_ENTRYPOINT_VERSION=v6
+export NGINX_CONFIG_VERSION=v9
+export APP_ENTRYPOINT_VERSION=v7
 
 sub_npm() {
   abra__service_="app"

compose.peertube-secret.yml

@@ -0,0 +1,14 @@
+---
+version: "3.8"
+
+services:
+  app:
+    environment:
+      - PEERTUBE_SECRET_FILE=/run/secrets/peertube_secret
+    secrets:
+      - peertube_secret
+
+secrets:
+  peertube_secret:
+    external: true
+    name: ${STACK_NAME}_peertube_secret_${SECRET_PEERTUBE_SECRET_VERSION}

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   web:
-    image: nginx:1.23.3
+    image: nginx:1.30.5
     networks:
       - proxy
       - internal
@@ -24,11 +24,6 @@ services:
     configs:
       - source: nginx_config
         target: /etc/nginx/nginx.conf
-    healthcheck:
-      test: curl -f http://app:9000/v1/api/ping || exit 1
-      interval: 5s
-      timeout: 3s
-      retries: 20
     deploy:
       restart_policy:
         condition: on-failure
@@ -37,8 +32,6 @@ services:
         order: start-first
       rollback_config:
         order: start-first
-      restart_policy:
-        max_attempts: 10
       labels:
         - "traefik.enable=true"
         - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
@@ -47,13 +40,14 @@ services:
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
 
   app:
-    image: chocobozzz/peertube:v5.0.1-bullseye
+    image: chocobozzz/peertube:v8.3.1-trixie
     environment:
       - PEERTUBE_ADMIN_EMAIL
       - PEERTUBE_CONTACT_FORM_ENABLED
       - PEERTUBE_DB_HOSTNAME=db
       - PEERTUBE_DB_PORT=5432
       - PEERTUBE_DB_USERNAME=peertube
+      - PEERTUBE_DB_PASSWORD_FILE=/run/secrets/db_password
       - PEERTUBE_LIVE_CHAT_ENABLED
       - PEERTUBE_LOG_PING_REQUESTS
       - PEERTUBE_REDIS_HOSTNAME=cache
@@ -85,18 +79,18 @@ services:
       - internal
     deploy:
       labels:
-        - "coop-cloud.${STACK_NAME}.version=4.0.0+v5.0.1-bullseye"
+        - "coop-cloud.${STACK_NAME}.version=8.4.1+v8.3.1-trixie"
 
   db:
-    image: postgres:10-alpine
+    image: pgautoupgrade/pgautoupgrade:18-alpine
     environment:
       - POSTGRES_USER=peertube
-      - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
       - POSTGRES_DB=peertube
+      - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
     secrets:
       - db_password
     volumes:
-      - postgres-data:/var/lib/postgresql/data
+      - postgres-data:/var/lib/postgresql/
     networks:
       - internal
     healthcheck:
@@ -106,7 +100,7 @@ services:
       retries: 10
 
   cache:
-    image: redis:7-alpine
+    image: redis:8-alpine
     volumes:
       - redis-data:/data
     networks:

entrypoint.sh.tmpl

@@ -24,7 +24,8 @@ file_env() {
    unset "$fileVar"
 }
 
-export PEERTUBE_DB_PASSWORD=$(cat /run/secrets/db_password)
+file_env "PEERTUBE_DB_PASSWORD"
+file_env "PEERTUBE_SECRET"
 
 {{ if eq (env "PEERTUBE_SMTP_ENABLED") "1" }}
 file_env "PEERTUBE_SMTP_PASSWORD"

nginx.conf.tmpl

@@ -39,15 +39,22 @@ http {
       try_files /dev/null @api;
     }
 
-    location = /api/v1/videos/upload-resumable {
+    location ~ ^/api/v1/videos/(upload-resumable|([^/]+/source/replace-resumable))$ {
       client_max_body_size    0;
       proxy_request_buffering off;
 
       try_files /dev/null @api;
     }
 
-    location = /api/v1/videos/upload {
-      limit_except POST HEAD { deny all; }
+  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; }
 
       # This is the maximum upload size, which roughly matches the maximum size of a video file.
       # Note that temporary space is needed equal to the total size of all concurrent uploads.
@@ -59,6 +66,13 @@ http {
       try_files /dev/null @api;
     }
 
+    location ~ ^/api/v1/runners/jobs/[^/]+/(update|success)$ {
+      client_max_body_size                      12G; # default is 1M
+      add_header            X-File-Maximum-Size 8G always; # inform backend of the set value in bytes before mime-encoding (x * 1.4 >= client_max_body_size)
+
+      try_files /dev/null @api;
+    }
+
     location ~ ^/api/v1/(videos|video-playlists|video-channels|users/me) {
       client_max_body_size                      3M; # default is 1M
       add_header            X-File-Maximum-Size 2M always; # inform backend of the set value in bytes before mime-encoding (x * 1.4 >= client_max_body_size)
@@ -93,6 +107,11 @@ http {
       try_files /dev/null @api_websocket;
     }
 
+    # Plugin websocket routes
+    location ~ ^/plugins/[^/]+(/[^/]+)?/ws/ {
+      try_files /dev/null @api_websocket;
+    }
+
     ##
     # Performance optimizations
     # For extra performance please refer to https://github.com/denji/nginx-tuning
@@ -111,7 +130,8 @@ http {
                       font/truetype
                       font/opentype
                       application/vnd.ms-fontobject
-                      image/svg+xml;
+                      image/svg+xml
+                      application/xml;
     gzip_min_length   1000; # default is 20 bytes
     gzip_buffers      16 8k;
     gzip_comp_level   2; # default is 1
@@ -148,54 +168,30 @@ http {
       alias /var/www/peertube/peertube-latest/client/dist/$1;
     }
 
-    # Bypass PeerTube for performance reasons. Optional.
-    location ~ ^/static/(thumbnails|avatars)/ {
-      if ($request_method = 'OPTIONS') {
-        add_header Access-Control-Allow-Origin  '*';
-        add_header Access-Control-Allow-Methods 'GET, OPTIONS';
-        add_header Access-Control-Allow-Headers 'Range,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-        add_header Access-Control-Max-Age       1728000; # Preflight request can be cached 20 days
-        add_header Content-Type                 'text/plain charset=UTF-8';
-        add_header Content-Length               0;
-        return 204;
-      }
-
-      add_header Access-Control-Allow-Origin    '*';
-      add_header Access-Control-Allow-Methods   'GET, OPTIONS';
-      add_header Access-Control-Allow-Headers   'Range,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-      add_header Cache-Control                  "public, max-age=7200"; # Cache response 2 hours
-
-      rewrite ^/static/(.*)$ /$1 break;
-
-      try_files $uri @api;
-    }
-
     # Plugin websocket routes
     location ~ ^/plugins/[^/]+(/[^/]+)?/ws/ {
       try_files /dev/null @api_websocket;
     }
 
-    location ~ ^(/static/(webseed|streaming-playlists)/private/)|^/download {
-      # We can't rate limit a try_files directive, so we need to duplicate @api
+      location ~ ^(/static/(webseed|web-videos|streaming-playlists)/private/)|^/download {
+      #We can't rate limit a try_files directive, so we need to duplicate @api
+
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header Host            $host;
       proxy_set_header X-Real-IP       $remote_addr;
-      
+     
+      # Prevent too much proxying, which results in high disk write IO
+      proxy_max_temp_file_size 50M;
       proxy_limit_rate 5M;
+
       proxy_pass http://backend;
     }
 
     # Bypass PeerTube for performance reasons. Optional.
-    location ~ ^/static/(webseed|redundancy|streaming-playlists)/ {
-      limit_rate_after            5M;
+      location ~ ^/static/(webseed|web-videos|redundancy|streaming-playlists)/ {
+	limit_rate_after            5M;
 
-      # Clients usually have 4 simultaneous webseed connections, so the real limit is 3MB/s per client
-      set $peertube_limit_rate    800k;
-
-      # Increase rate limit in HLS mode, because we don't have multiple simultaneous connections
-      if ($request_uri ~ -fragmented.mp4$) {
-        set $peertube_limit_rate  5M;
-      }
+      set $peertube_limit_rate  5M;
 
       # Use this line with nginx >= 1.17.0
       limit_rate $peertube_limit_rate;
@@ -216,23 +212,13 @@ http {
         add_header Access-Control-Allow-Origin  '*';
         add_header Access-Control-Allow-Methods 'GET, OPTIONS';
         add_header Access-Control-Allow-Headers 'Range,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-        add_header X-Cache-Status $upstream_cache_status;
-        add_header X-Cache-Range $slice_range;
-        add_header X-Fuuu ok;
-
-        add_header X-Accel-Expires 604800;
-
-        # Don't spam access log file with byte range requests
-        access_log off;
       }
 
-      aio threads;
-
       # Enabling the sendfile directive eliminates the step of copying the data into the buffer
       # and enables direct copying data from one file descriptor to another.
       sendfile on;
-      sendfile_max_chunk 1M; # prevent one fast connection from entirely occupying the worker process.
-                             # should be > 800k.
+      sendfile_max_chunk 1M; # prevent one fast connection from entirely occupying the worker process. should be > 800k.
+      aio threads;
 
   {{ if eq (env "NGINX_WEBSEED_PROXY_ENABLED") "1" }}
       proxy_connect_timeout       70;

release/5.0.0+v5.2.1-bullseye

@@ -0,0 +1,9 @@
+WARNING! ⚠️ 
+
+This release includes several major Postgres version updates, please make even more sure to take a database backup than usual
+
+Also, `PEERTUBE_SECRET `can now be stored in Docker, instead of just in a config file. To enable this behaviour:
+
+1. Extract the secret from the config file using `abra app run $STACK_NAME app grep peertube: /config/production.yaml | cut -d'"' -f2`
+2. Run `abra app secret insert $STACK_NAME peertube_secret v1`
+3. Run `abra app config $STACK_NAME`, and set `COMPOSE_FILE=compose.yml:compose.peertube-secret.yml`

release/6.1.0+v6.3.3-bookworm

@@ -0,0 +1,25 @@
+Before upgrading:
+
+You might need to migrate some data, depending on your setup:
+> Important for Docker admins If you enabled the "Keep a version of the input file" configuration, files may have been stored in the container instead of the host volume. To prevent data loss, you must copy the files on the host before upgrading using docker compose cp peertube:/app/storage/original-video-files docker-volume/data
+
+If you are upgrading from earlier versions, double check the configs `default.yml` and `production.yaml` as new config keys have been added but we are (currently) not tracking that file here (see issue: https://git.coopcloud.tech/coop-cloud/peertube/issues/17). 
+
+You can find the production.yaml.example here:
+https://github.com/Chocobozzz/PeerTube/blob/v6.3.3/config/production.yaml.example
+
+After upgrading:
+You need to manually execute a migration script after your upgrade while PeerTube is running and the database migration is complete (`Migrations finished. New migration version schema: 865` in PeerTube startup logs, this migration script may take a while).
+
+To search the logs: 
+`abra app logs <app>`
+
+To execute the migration: 
+
+```abra app run <app> app bash
+export ARGS="-e NODE_CONFIG_DIR=/config -e NODE_ENV=production"
+export PEERTUBE_DB_PASSWORD=$(cat /run/secrets/db_password)
+node dist/scripts/migrations/peertube-6.3.js```
+
+You can find the full release notes here:
+https://github.com/Chocobozzz/PeerTube/blob/develop/CHANGELOG.md#important-notes-5

release/7.1.0+v7.1.1-bookworm

@@ -0,0 +1,11 @@
+> Due to a bug in the remote video thumbnail update, we recommend running the prune storage script to clean up the filesystem
+
+```abra app run <app> app bash
+export ARGS="-e NODE_CONFIG_DIR=/config -e NODE_ENV=production"
+export PEERTUBE_DB_PASSWORD=$(cat /run/secrets/db_password)
+npm run prune-storage```
+
+> If you are using object storage, you will need to create the captions bucket or configure PeerTube to use an existing one in the configuration file or using environment variables if you use Docker (PEERTUBE_OBJECT_STORAGE_CAPTIONS_BUCKET_NAME, PEERTUBE_OBJECT_STORAGE_CAPTIONS_PREFIX, PEERTUBE_OBJECT_STORAGE_CAPTIONS_BASE_URL)
+
+See release notes: https://github.com/Chocobozzz/PeerTube/blob/develop/CHANGELOG.md#v710
+

release/7.3.0+v7.3.0-bookworm

@@ -0,0 +1 @@
+Please update your .env file, specially if you're using SMTP or RTMP.

release/8.0.0+v8.0.2-trixie

@@ -0,0 +1,23 @@
+Bumping peertube to v8.0.2
+
+* Ensure storage.uploads directory is set in your `production.yaml` (in `/var/lib/docker/volumes/<app>_app-config/_data`)
+* Copy over the [`default.yaml`](https://raw.githubusercontent.com/Chocobozzz/PeerTube/refs/tags/v8.0.2/config/default.yaml) in to `/var/lib/docker/volumes/<app>_app-config/_data/` 
+* Database migrations of this version can take a long time (up to 30 minutes on an instance with many users/federation actors and a slow database disk)
+* You need to manually execute a migration script after your upgrade while PeerTube is running and the database migration is complete(`Migrations finished. New migration version schema: 970 in PeerTube startup logs`):
+
+To search the logs:
+`abra app logs <app>`
+
+To run the migration:
+
+```
+abra app run <app> app bash --user peertube
+export ARGS="-e NODE_CONFIG_DIR=/config -e NODE_ENV=production"
+export PEERTUBE_DB_PASSWORD=$(cat /run/secrets/db_password)
+node dist/scripts/migrations/peertube-8.0.js```
+
+Full release notes:
+https://github.com/Chocobozzz/PeerTube/releases/tag/v8.0.0
+https://github.com/Chocobozzz/PeerTube/releases/tag/v8.0.1
+https://github.com/Chocobozzz/PeerTube/releases/tag/v8.0.2
+

release/8.1.0+v8.1.8-trixie

@@ -0,0 +1,28 @@
+Bumping peertube to v8.1.8
+
+* You need to manually execute a migration script after your upgrade while PeerTube is running and the database migration is complete(`Migrations finished. New migration version schema: 1000 in PeerTube startup logs`):
+
+To search the logs:
+`abra app logs <app>`
+
+To run the migration, regenerate thumbnails, prune storage:
+
+```
+abra app run <app> app bash --user peertube
+
+export ARGS="-e NODE_CONFIG_DIR=/config -e NODE_ENV=production"
+export PEERTUBE_DB_PASSWORD=$(cat /run/secrets/db_password)
+
+node dist/scripts/migrations/peertube-8.1.js
+
+npm run regenerate-thumbnails
+
+npm run prune-storage
+```
+
+
+
+Full release notes:
+https://github.com/Chocobozzz/PeerTube/releases/tag/v8.1.0
+
+https://github.com/Chocobozzz/PeerTube/releases/tag/v8.1.8

release/8.2.0+v8.2.1-trixie

@@ -0,0 +1,8 @@
+Bumping peertube to v8.2.1
+
+* Copy over the [`default.yaml`](https://raw.githubusercontent.com/Chocobozzz/PeerTube/refs/tags/v8.2.1/config/default.yaml) in to `/var/lib/docker/volumes/<app>_app-config/_data/` 
+
+Full release notes:
+https://github.com/Chocobozzz/PeerTube/releases/tag/v8.2.0
+
+Massive thanks to 3wc for the help!!

release/8.4.0+v8.3.0-trixie

@@ -0,0 +1,19 @@
+Bumping peertube to v8.3.0
+
+* If your instance has many videos (local or federated) in the database, automatic migrations at next startup can take several minutes to finish. Plan for a short period of downtime during this upgrade
+
+* You need to manually execute a migration script *after upgrading*, while PeerTube is running and the database migration is complete (Migrations finished. New migration version schema: 1125 in PeerTube startup logs)
+
+To search the logs:
+`abra app logs <app>`
+
+To run the migration:
+
+```
+abra app run <app> app bash --user peertube
+export ARGS="-e NODE_CONFIG_DIR=/config -e NODE_ENV=production"
+export PEERTUBE_DB_PASSWORD=$(cat /run/secrets/db_password)
+node dist/scripts/migrations/peertube-8.3.js```
+
+Full release notes:
+https://github.com/Chocobozzz/PeerTube/releases/tag/v8.3.0