theia: peertube test fixup

software/peertube/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 9eed4136d9d6f8f855b73bbfefa6397c
 
 [instance-peertube]
 _update_hash_filename_ = instance-peertube.cfg.in
-md5sum = c097b0ad9ea49bef467e45a4ec1f0c3d
+md5sum = f74c0c98e26cf489f9276c740886a640
 
 [template-nginx-service]
 filename = template-nginx-service.sh.in
@@ -34,7 +34,7 @@ md5sum = e761995c4c18efc4a199f11dc8fde039
 
 [template-nginx-configuration]
 filename = template-nginx.cfg.in
-md5sum = a2c81009508d7efcdb7fc7f9348259d8
+md5sum = f0cba744a9803054d69163f3c40fe354
 
 [template-dcron-service]
 filename = template-dcron-service.sh.in
@@ -50,4 +50,4 @@ md5sum = f1f82101258de19068262b7213fc478b
 
 [template-peertube-backup-script]
 filename = template-peertube-backup.sh.in
-md5sum = fcac5b0280952ee63bd614027c9290d5
+md5sum = defe333fb5bf799cfe7a77e0f17e35ca

software/peertube/instance-peertube.cfg.in

@@ -61,7 +61,6 @@ superuser = peertube
 password = ${postgresql-password:passwd}
 pgdata-directory = ${directory:srv}/postgresql
 
-ipv44 = {{ slapparameter_dict.get('ipv4-random') }}
 ipv4 = {{ ipv4_random }}
 # disable listening on ipv6
 ipv6 =
@@ -96,7 +95,6 @@ url = {{ template_nginx_configration }}
 output = ${directory:etc}/nginx.cfg
 access_log = ${directory:log}/nginx-access.log
 error_log = ${directory:log}/nginx-error.log
-ipv6 = {{ slapparameter_dict.get('ipv6-random') }}
 ip = {{ ipv6_random }}
 port = 9443
 ssl_key = ${directory:ssl}/nginx.key
@@ -200,7 +198,7 @@ recipe = slapos.recipe.template
 url = {{ template_crontab_line }}
 output = ${directory:cron-lines}/${:_buildout_section_name_}
 script = ${peertube-backup-script:output}
-frequency = daily
+frequency = {{ slapparameter_dict.get('frequency') }}
 
 [activate-crontab-file]
 # XXX File is never removed

software/peertube/template-nginx.cfg.in

@@ -56,7 +56,6 @@ upstream backend {
 
 server {
   listen [$${nginx-configuration:ip}]:$${nginx-configuration:port};
-  #$${nginx-configuration:ipv6}
 
   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;

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

@@ -2,5 +2,3 @@ echo "Hello Peertube"
 
 # Dump the databse
 $${postgresql:bin}/pg_dump -h $${postgresql:pgdata-directory} -U $${postgresql:superuser} -Fc peertube_prod > $${directory:peertube_directory}/peertube_prod-dump.db
-
-$${postgresql:bin}/pg_dump -h $${postgresql:pgdata-directory} -U $${postgresql:superuser} --column-inserts --data-only --table=user peertube_prod > $${directory:peertube_directory}/peertube_prod-dump.sql

software/theia/test/project_tests.py

@@ -299,6 +299,7 @@ class TestTheiaResiliencePeertube(test_resiliency.TestTheiaResilience):
     soon = (datetime.now() + timedelta(minutes=4)).replace(second=0)
     frequency = '%d * * * *' % soon.minute
     params = '_={"peertube-backup-cron": {"frequency": "%s"}, }' % frequency
+    params = '_={"frequency": "%s"}' % frequency
 
     # Update Peertube parameters
     print('Requesting Peertube with parameters %s' % params)