From 0bbece581940243a9fc39f2a992e2f55c8f2a43e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorben=20G=C3=BCnther?= <admin@xenrox.net>
Date: Fri, 17 Sep 2021 13:39:07 +0200
Subject: [PATCH] peertube: Upstream update

---
 roles/peertube/files/peertube.conf          |  6 ----
 roles/peertube/templates/production.yaml.j2 | 33 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/roles/peertube/files/peertube.conf b/roles/peertube/files/peertube.conf
index 07071da..cea87c4 100644
--- a/roles/peertube/files/peertube.conf
+++ b/roles/peertube/files/peertube.conf
@@ -198,12 +198,6 @@ server {
         sendfile_max_chunk 1M; # prevent one fast connection from entirely occupying the worker process. should be > 800k.
         aio threads;
 
-        # Use this in tandem with fuse-mounting i.e. https://docs.joinpeertube.org/admin-remote-storage
-        # to serve files directly from a public bucket without proxying.
-        # Assumes you have buckets named after the storage subdirectories, i.e. 'videos', 'redundancy', etc.
-        #set $cdn <your S3-compatiable bucket public url mounted via fuse>;
-        #rewrite ^/static/webseed/(.*)$ $cdn/videos/$1 redirect;
-        #rewrite ^/static/(.*)$         $cdn/$1        redirect;
         rewrite ^/static/webseed/(.*)$ /videos/$1 break;
         rewrite ^/static/(.*)$ /$1 break;
 
diff --git a/roles/peertube/templates/production.yaml.j2 b/roles/peertube/templates/production.yaml.j2
index d67cfc6..3282d0e 100644
--- a/roles/peertube/templates/production.yaml.j2
+++ b/roles/peertube/templates/production.yaml.j2
@@ -93,6 +93,39 @@ storage:
   # If not, peertube will fallback to the default fil
   client_overrides: "/var/lib/peertube/storage/client-overrides/"
 
+object_storage:
+  enabled: false
+
+  # Without protocol, will default to HTTPS
+  endpoint: "" # 's3.amazonaws.com' or 's3.fr-par.scw.cloud' for example
+
+  region: "us-east-1"
+
+  credentials:
+    # You can also use AWS_ACCESS_KEY_ID env variable
+    access_key_id: ""
+    # You can also use AWS_SECRET_ACCESS_KEY env variable
+    secret_access_key: ""
+
+  # Maximum amount to upload in one request to object storage
+  max_upload_part: 2GB
+
+  streaming_playlists:
+    bucket_name: "streaming-playlists"
+
+    # Allows setting all buckets to the same value but with a different prefix
+    prefix: "" # Example: 'streaming-playlists:'
+
+    # Base url for object URL generation, scheme and host will be replaced by this URL
+    # Useful when you want to use a CDN/external proxy
+    base_url: "" # Example: 'https://mirror.example.com'
+
+  # Same settings but for webtorrent videos
+  videos:
+    bucket_name: "videos"
+    prefix: ""
+    base_url: ""
+
 log:
   level: "info" # debug/info/warning/error
   rotation:
-- 
2.44.0