peertube: fixup

software/peertube/buildout.hash.cfg

@@ -28,10 +28,6 @@ filename = template-peertube-service.sh.in
 filename = template-peertube-production.yaml.in
 # md5sum = 458870b70c33a1621b68961ae2372ad5
 
-# [template-peertube-nginx-available]
-# filename = template-peertube-nginx-available.in
-# # md5sum = 458870b70c33a1621b68961ae2372ad5
-
 [template-peertube-default]
 filename = template-peertube-default.yaml.in
 # md5sum = 458870b70c33a1621b68961ae2372ad5

software/peertube/software.cfg

@@ -99,11 +99,6 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/${:filename}
 
-# [template-peertube-nginx-available]
-# recipe = slapos.recipe.template
-# url = ${:_profile_base_location_}/${:filename}
-# output = ${buildout:directory}/${:filename}
-
 [template-nginx-service]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}

software/peertube/template-nginx.cfg.in

@@ -92,7 +92,7 @@ server {
 
   location @api {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header Host            $host;
+    proxy_set_header Host            '[$${nginx-configuration:ip}]:$${nginx-configuration:port}';
     proxy_set_header X-Real-IP       $remote_addr;
 
     client_max_body_size  100k; # default is 1M
@@ -105,9 +105,9 @@ server {
     proxy_pass http://backend;
   }
 
-  # location / {
-  #   try_files /dev/null @api;
-  # }
+  location / {
+    try_files /dev/null @api;
+  }
 
   location = /api/v1/videos/upload-resumable {
     client_max_body_size    0;
@@ -208,7 +208,7 @@ server {
 
     root $${directory:peertube_directory}/;
 
-    try_files /storage/client-overrides/$1 /peertube-latest/client/dist/$1 @api;
+    try_files $${directory:storage}/client-overrides/$1 $${directory:peertube_directory}/client/dist/$1 @api;
   }
 
   # Bypass PeerTube for performance reasons. Optional.

software/peertube/template-peertube-default.yaml.in

@@ -6,9 +6,9 @@ listen:
 
 # Correspond to your reverse proxy server_name/listen configuration (i.e., your public PeerTube instance URL)
 webserver:
-  https: false
-  hostname: 'localhost'
-  port: 9000
+  https: true
+  hostname: '[$${nginx-configuration:ip}]'
+  port: $${nginx-configuration:port}
 
 # Secrets you need to generate the first time you run PeerTube
 secrets:

software/peertube/template-peertube-production.yaml.in

@@ -174,7 +174,7 @@ object_storage:
     base_url: ''
 
 log:
-  level: 'info' # 'debug' | 'info' | 'warn' | 'error'
+  level: 'debug' # 'debug' | 'info' | 'warn' | 'error'
 
   rotation:
     enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate