Commit 0366682a authored by Boxiang Sun's avatar Boxiang Sun

peertube: fixup

parent 818f087f
Pipeline #24996 passed with stage
in 0 seconds
......@@ -29,6 +29,7 @@ configure-options =
--without-libxml
--without-libxslt
# build core PostgreSQL + pg_trgm contrib extension for GitLab
# unaccent contrib extension is for peertube
make-targets = install && make -C contrib/pg_trgm/ install && make -C contrib/unaccent/ install
environment =
CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
......
......@@ -14,11 +14,11 @@
# not need these here).
[instance-profile]
filename = instance.cfg.in
md5sum = b67bad9012a8f79c66779d4c660828e2
md5sum = 35690065ba18dc49d0108fc1f0a07b9e
[instance-peertube]
_update_hash_filename_ = instance-peertube.cfg.in
md5sum = 3096a4d3e117752b4827925129d61331
md5sum = 0bc5a5fbf922fc884f00038f19faa147
[template-nginx-service]
filename = template-nginx-service.sh.in
......
......@@ -2,6 +2,10 @@
"$schema": "http://json-schema.org/draft-04/schema#",
"description": "Values returned by Peertube instanciation",
"properties": {
"frontend-url": {
"description": "Peertube Frontend URL",
"type": "string"
},
"backend-url": {
"description": "Peertube Backend URL",
"type": "string"
......
......@@ -77,7 +77,7 @@ link-binary = ${postgresql:bin}/postgres ${postgresql:bin}/psql
[nginx-service]
recipe = slapos.recipe.template
url = {{ tempalte_nginx_service }}
url = {{ template_nginx_service }}
output = ${directory:services}/nginx
virtual-depends =
${nginx-configuration:ip}
......@@ -162,7 +162,7 @@ config-url = ${peertube-parameters:frontend-url}
[peertube-service]
recipe = slapos.recipe.template
url = {{ tempalte_peertube_service }}
url = {{ template_peertube_service }}
output = ${directory:services}/peertube
[peertube-database-resiliency-exclude-file]
......@@ -172,7 +172,7 @@ output = ${directory:srv}/exporter.exclude
[peertube-database-resiliency-after-import-script]
recipe = slapos.recipe.template
url = {{ tempalte_peertube_restore }}
url = {{ template_peertube_restore }}
output = ${directory:srv}/runner-import-restore
mode = 755
......@@ -187,7 +187,7 @@ logfile = ${directory:log}/crond.log
[peertube-backup-script]
recipe = slapos.recipe.template
url = {{ tempalte_peertube_backup }}
url = {{ template_peertube_backup }}
output = ${directory:etc}/${:_buildout_section_name_}
mode = 0744
......@@ -272,8 +272,7 @@ init =
[publish-connection-parameter]
recipe = slapos.cookbook:publish
frontend-hostname = ${frontend:connection-domain}
backend-url = ${frontend:config-url}
frontend-url = ${peertube-parameters:frontend-url}
password = ${peertube-passwd:passwd}
username = root
username = ${peertube-passwd:username}
......@@ -19,13 +19,13 @@ context =
raw ipv4_random $${slap-configuration:ipv4-random}
raw template_peertube_yaml ${template-peertube-yaml:output}
raw template_nginx_configration ${template-nginx-configuration:output}
raw tempalte_peertube_service ${template-peertube-service:output}
raw tempalte_peertube_restore ${template-peertube-restore-script:output}
raw template_peertube_service ${template-peertube-service:output}
raw template_peertube_restore ${template-peertube-restore-script:output}
raw postgresql10_location ${postgresql10:location}
raw tempalte_nginx_service ${template-nginx-service:output}
raw template_nginx_service ${template-nginx-service:output}
raw redis_binprefix ${redis28:location}/bin
raw template_dcron_service ${template-dcron-service:output}
raw tempalte_peertube_backup ${template-peertube-backup-script:output}
raw template_peertube_backup ${template-peertube-backup-script:output}
raw template_crontab_line ${template-crontab-line:output}
raw coreutils_cat ${coreutils-output:cat}
raw template_crontab ${template-crontab:output}
......
......@@ -43,7 +43,6 @@ parts =
gcc
unzip
curl
vim
nodejs
yarn
openssl
......@@ -52,7 +51,6 @@ parts =
ffmpeg
postgresql
redis
git
wget
# peetube sections
peertube
......
......@@ -119,7 +119,7 @@ class ERP5Mixin(object):
instance_type, 'srv', 'runner', 'instance', partition, *paths)
class TestERP5ResilienceERP5(ERP5Mixin, test_resiliency.TestTheiaResilience):
class TestTheiaResilienceERP5(ERP5Mixin, test_resiliency.TestTheiaResilience):
test_instance_max_retries = 12
backup_max_tries = 480
backup_wait_interval = 60
......@@ -267,9 +267,6 @@ class TestTheiaResiliencePeertube(test_resiliency.TestTheiaResilience):
peertube_conenction_info = self._getPeertubeConnexionParameters()
frontend_url = peertube_conenction_info['frontend-url']
# frontend_url: https://[2001:67c:1254:fd::9ee2]:9443
# self.connection_parameters
# {'backend-url': 'https://[2001:67c:1254:fd::9ee2]:9443', 'frontend-hostname': '[2001:67c:1254:fd::9ee2]:9443', 'frontend-url': 'https://[2001:67c:1254:fd::9ee2]:9443', 'password': '8ydTfRpv', 'username': 'root'}
response = requests.get(frontend_url + '/api/v1/oauth-clients/local', verify=False)
self.assertEqual(requests.codes['OK'], response.status_code)
try:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment