peertube: test fixup

software/peertube/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 35690065ba18dc49d0108fc1f0a07b9e
 
 [instance-peertube]
 _update_hash_filename_ = instance-peertube.cfg.in
-md5sum = c20388ca9ad265756291f3429fb084a2
+md5sum = 6a1ed9ff4f27f46abba54efe4fc8c2d6
 
 [template-nginx-service]
 filename = template-nginx-service.sh.in
@@ -34,7 +34,7 @@ md5sum = e761995c4c18efc4a199f11dc8fde039
 
 [template-nginx-configuration]
 filename = template-nginx.cfg.in
-md5sum = f0cba744a9803054d69163f3c40fe354
+md5sum = ca85c3afd3e626a367b5f1fb0cd8ead7
 
 [template-dcron-service]
 filename = template-dcron-service.sh.in

software/peertube/instance-peertube.cfg.in

@@ -35,7 +35,6 @@ crontabs = ${:etc}/crontabs
 cron-entries = ${:etc}/cron.d
 cronstamps = ${:etc}/cronstamps
 cron-lines = ${:etc}/cron.lines
-nginx = ${:etc}/nginx
 peertube_nginx_log = ${:log}/nginx
 varnginx = ${:var}/nginx
 services = ${:etc}/service
@@ -202,7 +201,7 @@ mode = 0744
 [peertube-backup-cron]
 recipe = slapos.recipe.template
 url = {{ template_crontab_line }}
-output = ${directory:cron-lines}/${:_buildout_section_name_}
+output = ${directory:bin}/${:_buildout_section_name_}
 script = ${peertube-backup-script:output}
 frequency = {{ slapparameter_dict.get('frequency', '@daily') }}
 
@@ -210,7 +209,7 @@ frequency = {{ slapparameter_dict.get('frequency', '@daily') }}
 # XXX File is never removed
 recipe = plone.recipe.command
 stop-on-error = true
-command = {{ coreutils_cat }} {{ template_crontab }} ${peertube-backup-cron:output} | {{ dcron_output }} -c ${directory:crontabs} -
+command = {{ coreutils_cat }} ${peertube-backup-cron:output} | {{ dcron_output }} -c ${directory:crontabs} -
 
 [frontend]
 <= slap-connection

software/peertube/template-nginx.cfg.in

@@ -133,7 +133,7 @@ server {
   location @api_websocket {
     proxy_http_version 1.1;
     proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header   Host            $host;
+    proxy_set_header   Host            $http_host;
     proxy_set_header   X-Real-IP       $remote_addr;
     proxy_set_header   Upgrade         $http_upgrade;
     proxy_set_header   Connection      "upgrade";

software/theia/test/project_tests.py

@@ -336,8 +336,8 @@ class TestTheiaResiliencePeertube(test_resiliency.TestTheiaResilience):
     # Do a fake periodically update
     # Compute backup date in the near future
     soon = (datetime.now() + timedelta(minutes=4)).replace(second=0)
-    frequency = '%d * * * *' % soon.minute
-    params = '"frequency"="%s"' % frequency
+    frequency = "%d * * * *" % soon.minute
+    params = 'frequency=%s' % frequency
 
     # Update Peertube parameters
     print('Requesting Peertube with parameters %s' % params)