peertube configuration file improvement

software/peertube/buildout.hash.cfg

@@ -28,9 +28,9 @@ 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-nginx-available]
+# filename = template-peertube-nginx-available.in
+# # md5sum = 458870b70c33a1621b68961ae2372ad5
 
 [template-peertube-default]
 filename = template-peertube-default.yaml.in

software/peertube/instance.cfg.in

@@ -8,8 +8,6 @@ parts =
   postgresql
   nginx-service
   nginx-listen-promise
-  peertube-nginx-available
-  peertube-nginx-enabled
   peertube-default-yaml
   peertube-production-yaml
   peertube-service
@@ -27,28 +25,15 @@ log = $${:var}/log
 run = $${:var}/run
 www = $${:var}/www
 nginx = $${:etc}/nginx
-nginx_sites-available = $${:nginx}/sites-available
-nginx_sites-enabled = $${:nginx}/sites-enabled
+peertube_nginx_log = $${:log}/nginx
 varnginx = $${:var}/nginx
 services = $${:etc}/service
-xoxox = $${buildout:directory}/xoxox
-wwwx = $${:var}/wwwx
 peertube_directory = $${:www}/peertube
 config = $${:peertube_directory}/config
 storage = $${:peertube_directory}/storage
 versions = $${:peertube_directory}/versions
 ssl = $${:etc}/ssl
 
-[peertube-nginx-available]
-recipe = slapos.recipe.template
-url = ${template-peertube-nginx-available:output}
-output = $${directory:nginx_sites-available}/peertube
-
-[peertube-nginx-enabled]
-recipe = slapos.recipe.template
-url = ${template-peertube-nginx-available:output}
-output = $${directory:nginx_sites-enabled}/peertube
-
 [peertube-default-yaml]
 recipe = slapos.recipe.template
 url = ${template-peertube-default:output}
@@ -83,7 +68,7 @@ port = 5432
 
 [service-postgresql]
 recipe  = slapos.cookbook:postgres
-bin     = {{ postgresql_location }}/bin
+bin     = ${postgresql10:location}/bin
 services= $${directory:service}
 
 #################################
@@ -102,7 +87,7 @@ promise = check_url_available
 name = nginx_listen.py
 config-host = [$${nginx-configuration:ip}]
 config-port = $${nginx-configuration:port}
-config-url = https://$${:config-host}/$${:config-port}
+config-url = https://$${:config-host}:$${:config-port}
 
 [nginx-configuration]
 recipe = slapos.recipe.template
@@ -110,8 +95,6 @@ url = ${template-nginx-configuration:output}
 output = $${directory:etc}/nginx.cfg
 access_log = $${directory:log}/nginx-access.log
 error_log = $${directory:log}/nginx-error.log
-nginx_sites-available = $${directory:nginx_sites-available}/peertube
-nginx_sites-enabled = $${directory:nginx_sites-enabled}/peertube
 ip = $${instance-parameter:ipv6-random}
 port = 9443
 ssl_key = $${directory:ssl}/nginx.key

software/peertube/software.cfg

@@ -99,10 +99,10 @@ 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-peertube-nginx-available]
+# recipe = slapos.recipe.template
+# url = ${:_profile_base_location_}/${:filename}
+# output = ${buildout:directory}/${:filename}
 
 [template-nginx-service]
 recipe = slapos.recipe.template

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

@@ -58,8 +58,7 @@ database:
 # You can also specify a 'socket' path to a unix socket but first need to
 # set 'hostname' and 'port' to null
 redis:
-  hostname: 'localhost'
-  port: 6379
+  socket: $${service-redis:unixsocket}
   auth: null
   db: 0
 

software/peertube/template-peertube-nginx-available.in

@@ -3,29 +3,27 @@
 # STANDARD HTTP MODULES: Core, Proxy, Rewrite, Access, Gzip, Headers, HTTP/2, Log, Real IP, SSL, Thread Pool, Upstream, AIO Multithreading.
 # THIRD PARTY MODULES:   None.
 
-server {
-  listen 80;
-  listen [::]:80;
-  server_name $https://[$${nginx-configuration:ip}]/$${nginx-configuration:port};
-
-  location /.well-known/acme-challenge/ {
-    default_type "text/plain";
-    root /var/www/certbot;
-  }
-  location / { return 301 https://$host$request_uri; }
-}
+# server {
+#   listen 80;
+#   listen [::]:80;
+#   server_name [$${nginx-configuration:ip}];
+
+#   location /.well-known/acme-challenge/ {
+#     default_type "text/plain";
+#     root /var/www/certbot;
+#   }
+#   location / { return 301 https://$host$request_uri; }
+# }
 
 upstream backend {
   server 127.0.0.1:9000;
 }
 
 server {
-  listen 443 ssl http2;
-  listen [::]:443 ssl http2;
-  server_name https://[$${nginx-configuration:ip}]/$${nginx-configuration:port};
+  listen [$${nginx-configuration:ip}]:$${nginx-configuration:port};
 
-  access_log /var/log/nginx/peertube.access.log; # reduce I/0 with buffer=10m flush=5m
-  error_log  /var/log/nginx/peertube.error.log;
+  access_log $${directory:peertube_nginx_log}/peertube.access.log; # reduce I/0 with buffer=10m flush=5m
+  error_log  $${directory:peertube_nginx_log}/peertube.error.log;
 
   ##
   # Certificates
@@ -37,21 +35,21 @@ server {
     root /var/www/certbot;
   }
 
-  ##
-  # Security hardening (as of Nov 15, 2020)
-  # based on Mozilla Guideline v5.6
-  ##
+  # ##
+  # # Security hardening (as of Nov 15, 2020)
+  # # based on Mozilla Guideline v5.6
+  # ##
 
-  ssl_protocols             TLSv1.2 TLSv1.3;
-  ssl_prefer_server_ciphers on;
-  ssl_ciphers               ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256; # add ECDHE-RSA-AES256-SHA if you want compatibility with Android 4
-  ssl_session_timeout       1d; # defaults to 5m
-  ssl_session_cache         shared:SSL:10m; # estimated to 40k sessions
-  ssl_session_tickets       off;
-  ssl_stapling              on;
-  ssl_stapling_verify       on;
-  # HSTS (https://hstspreload.org), requires to be copied in 'location' sections that have add_header directives
-  #add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
+  # ssl_protocols             TLSv1.2 TLSv1.3;
+  # ssl_prefer_server_ciphers on;
+  # ssl_ciphers               ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256; # add ECDHE-RSA-AES256-SHA if you want compatibility with Android 4
+  # ssl_session_timeout       1d; # defaults to 5m
+  # ssl_session_cache         shared:SSL:10m; # estimated to 40k sessions
+  # ssl_session_tickets       off;
+  # ssl_stapling              on;
+  # ssl_stapling_verify       on;
+  # # HSTS (https://hstspreload.org), requires to be copied in 'location' sections that have add_header directives
+  # #add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
 
   ##
   # Application
@@ -135,7 +133,7 @@ server {
   # For extra performance please refer to https://github.com/denji/nginx-tuning
   ##
 
-  root /var/www/peertube/storage;
+  root $${directory:storage};
 
   # Enable compression for JS/CSS/HTML, for improved client load times.
   # It might be nice to compress JSON/XML as returned by the API, but
@@ -166,24 +164,24 @@ server {
 
   # If you have a small /var/lib partition, it could be interesting to store temp nginx uploads in a different place
   # See https://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_temp_path
-  #client_body_temp_path /var/www/peertube/storage/nginx/;
+  #client_body_temp_path $${directory:storage}/nginx/;
 
   # Bypass PeerTube for performance reasons. Optional.
   # Should be consistent with client-overrides assets list in /server/controllers/client.ts
   location ~ ^/client/(assets/images/(icons/icon-36x36\.png|icons/icon-48x48\.png|icons/icon-72x72\.png|icons/icon-96x96\.png|icons/icon-144x144\.png|icons/icon-192x192\.png|icons/icon-512x512\.png|logo\.svg|favicon\.png|default-playlist\.jpg|default-avatar-account\.png|default-avatar-account-48x48\.png|default-avatar-video-channel\.png|default-avatar-video-channel-48x48\.png))$ {
     add_header Cache-Control "public, max-age=31536000, immutable"; # Cache 1 year
 
-    root /var/www/peertube;
+    root $${directory:peertube_directory}/;
 
     try_files /storage/client-overrides/$1 /peertube-latest/client/dist/$1 @api;
   }
 
   # Bypass PeerTube for performance reasons. Optional.
-  location ~ ^/client/(.*\.(js|css|png|svg|woff2|otf|ttf|woff|eot))$ {
-    add_header Cache-Control "public, max-age=31536000, immutable"; # Cache 1 year
+  # location ~ ^/client/(.*\.(js|css|png|svg|woff2|otf|ttf|woff|eot))$ {
+  #   add_header Cache-Control "public, max-age=31536000, immutable"; # Cache 1 year
 
-    alias /var/www/peertube/peertube-latest/client/dist/$1;
-  }
+  #   alias $${directory:var}/www/peertube/peertube-latest/client/dist/$1;
+  # }
 
   # Bypass PeerTube for performance reasons. Optional.
   location ~ ^/static/(thumbnails|avatars)/ {

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

@@ -5,8 +5,8 @@ listen:
 # Correspond to your reverse proxy server_name/listen configuration (i.e., your public PeerTube instance URL)
 webserver:
   https: true
-  hostname: 'https://[$${nginx-configuration:ip}]/$${nginx-configuration:port}'
-  port: 443
+  hostname: '[$${nginx-configuration:ip}]'
+  port: $${nginx-configuration:port}
 
 # Secrets you need to generate the first time you run PeerTube
 secrets:
@@ -56,7 +56,7 @@ database:
 # You can also specify a 'socket' path to a unix socket but first need to
 # set 'hostname' and 'port' to null
 redis:
-  unixsocket: $${service-redis:unixsocket}
+  socket: $${service-redis:unixsocket}
   auth: null
   db: 0
 

software/peertube/template-peertube-service.sh.in

-cd ${peertube:location} &&
-
 # setup db
 
 die() {
@@ -28,11 +26,5 @@ while true; do
 done
 echo "I: PostgreSQL ready." 1>&2
 
-# make sure pg_trgm extension is enabled for peertube db
-# $${postgresql:bin}/psql -c 'CREATE EXTENSION IF NOT EXISTS pg_trgm;'  $${postgresql:dbname} || die "pg_trgm setup failed"
-
-# make sure unaccent extension is enabled for peertube db
-# $${postgresql:bin}/psql -c 'CREATE EXTENSION IF NOT EXISTS unaccent;'  $${postgresql:dbname} || die "unaccent setup failed"
-
 exec env NODE_ENV=production NODE_CONFIG_DIR=$${directory:config} PATH=${ffmpeg:location}/bin:$PATH\
   ${nodejs:location}/bin/node ${peertube:location}/dist/server