Commit 02900123 authored by Kirill Smelkov's avatar Kirill Smelkov

erp5: jupyter.enable is boolean, not string

When originally in 0a446263 (ERP5 and Jupyter integrated together) I added
Jupyter support into ERP5 the parameter for whether to enable/disable it was
declared as boolean in JSON schema but processed as string in instance code,
this way preventing usage of real JSON's boolean.

Fix it.

(also fixing up software/slapos-master/ which copied the files for play in 87d13789)

/noticed-by @vpelletier (on !43)
parent d22a423d
......@@ -6,7 +6,7 @@
{% set publish_dict = {'site-id': site_id, 'inituser-login': inituser_login} -%}
{% set has_posftix = slapparameter_dict.get('smtp', {}).get('postmaster') -%}
{% set jupyter_dict = slapparameter_dict.get('jupyter', {}) -%}
{% set has_jupyter = jupyter_dict.get('enable', jupyter_enable_default).lower() in ('true', 'yes') -%}
{% set has_jupyter = jupyter_dict.get('enable', jupyter_enable_default.lower() in ('true', 'yes')) -%}
Please register or sign in to reply
{% set jupyter_zope_family = jupyter_dict.get('zope-family', '') -%}
[request-common]
<= request-common-base
......
......@@ -52,7 +52,7 @@ mode = 644
[template-erp5]
< = download-base-part
filename = instance-erp5.cfg.in
md5sum = 6b7712c26dfdd105e8a1143d04839651
md5sum = 073b96888388a39721a8cef3e90c5c5b
[template-balancer]
< = download-base-part
......
......@@ -331,7 +331,7 @@ rendered = ${monitor-template-dummy:target}
[template-erp5]
<= download-base
filename = instance-erp5.cfg.in
md5sum = cb0a8dfc15874939ec786a8b7ac5bff1
md5sum = b5f49c90017684aa3389ef3f97ece509
[template-zeo]
<= download-base
......
......@@ -6,7 +6,7 @@
{% set publish_dict = {'site-id': site_id, 'inituser-login': inituser_login} -%}
{% set has_posftix = slapparameter_dict.get('smtp', {}).get('postmaster') -%}
{% set jupyter_dict = slapparameter_dict.get('jupyter', {}) -%}
{% set has_jupyter = jupyter_dict.get('enable', jupyter_enable_default).lower() in ('true', 'yes') -%}
{% set has_jupyter = jupyter_dict.get('enable', jupyter_enable_default.lower() in ('true', 'yes')) -%}
{% set jupyter_zope_family = jupyter_dict.get('zope-family', '') -%}
[request-common]
<= request-common-base
......
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