peertube: add peertube promise

software/peertube/instance.cfg.in

@@ -11,6 +11,7 @@ parts =
   peertube-service
   publish-connection-parameter
   nginx-listen-promise
+  peertube-listen-promise
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -39,6 +40,12 @@ recipe = slapos.recipe.template
 url = ${template-peertube:output}
 output = $${directory:config}/peertube.yaml
 
+[peertube-listen-promise]
+<= monitor-promise-base
+promise = check_url_available
+name = peertube_listen.py
+config-url = https://$${frontend:connection-domain}
+
 [peertube-service]
 recipe = slapos.recipe.template
 url = ${template-peertube-service:output}
@@ -80,7 +87,8 @@ virtual-depends =
 <= monitor-promise-base
 promise = check_url_available
 name = nginx_listen.py
-config-url = https://$${frontend:connection-domain}
+config-verify = 0
+config-url = https://[$${nginx-configuration:ip}]:$${nginx-configuration:port}
 
 [nginx-configuration]
 recipe = slapos.recipe.template

software/peertube/template-nginx.cfg.in

@@ -60,16 +60,6 @@ server {
   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
-  # you need a certificate to run in production. see https://letsencrypt.org/
-  ##
-
-  location ^~ '/.well-known/acme-challenge' {
-    default_type "text/plain";
-    root /var/www/certbot;
-  }
-
   ##
   # Security hardening (as of Nov 15, 2020)
   # based on Mozilla Guideline v5.6

software/peertube/template-peertube.yaml.in

@@ -11,7 +11,7 @@ webserver:
 # Secrets you need to generate the first time you run PeerTube
 secrets:
   # Generate one using `openssl rand -hex 32`
-  peertube: ''
+  peertube: '35b4c762c8eb9e3ccb5bd7ad482ba4ecba0f99571db51ece24976e0f666fea48'
 
 rates_limit:
   api:
@@ -174,7 +174,7 @@ object_storage:
     base_url: ''
 
 log:
-  level: 'debug' # 'debug' | 'info' | 'warn' | 'error'
+  level: 'info' # '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

software/peertube/test/test.py

@@ -37,7 +37,7 @@ setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
 
 
 
-ipv6_regexp =   '''(?:(?x)(?:(?:[0-9a-f]{1,4}:){1,1}(?::[0-9a-f]{1,4}){1,6})|
+ipv6_regexp =   '''(?x)(?:(?:(?:[0-9a-f]{1,4}:){1,1}(?::[0-9a-f]{1,4}){1,6})|
 (?:(?:[0-9a-f]{1,4}:){1,2}(?::[0-9a-f]{1,4}){1,5})|
 (?:(?:[0-9a-f]{1,4}:){1,3}(?::[0-9a-f]{1,4}){1,4})|
 (?:(?:[0-9a-f]{1,4}:){1,4}(?::[0-9a-f]{1,4}){1,3})|