Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Roque
slapos
Commits
50a885d7
Commit
50a885d7
authored
Jan 09, 2018
by
Sebastian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
instance_erp5: Add instance parameter pass-through for jupyter jiocontents parameter
parent
05135d13
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+1
-1
stack/erp5/instance-erp5.cfg.in
stack/erp5/instance-erp5.cfg.in
+3
-1
No files found.
stack/erp5/buildout.hash.cfg
View file @
50a885d7
...
@@ -79,7 +79,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
...
@@ -79,7 +79,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
[template-erp5]
[template-erp5]
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
14ec590eaaebc90113f1c589ea8dd444
md5sum =
2a5a8342eb403630372830fe5d19355e
[template-zeo]
[template-zeo]
filename = instance-zeo.cfg.in
filename = instance-zeo.cfg.in
...
...
stack/erp5/instance-erp5.cfg.in
View file @
50a885d7
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
{% set jupyter_dict = slapparameter_dict.get('jupyter', {}) -%}
{% 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', '') -%}
{% set jupyter_zope_family = jupyter_dict.get('zope-family', '') -%}
{% set jupyter_hateoas_url = jupyter_dict.get('erp5-hateoas-url', '') -%}
[request-common]
[request-common]
<= request-common-base
<= request-common-base
config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
...
@@ -216,7 +217,8 @@ config-url = ${request-balancer:connection-{{ family_name }}-v6}
...
@@ -216,7 +217,8 @@ config-url = ${request-balancer:connection-{{ family_name }}-v6}
{% if has_jupyter -%}
{% if has_jupyter -%}
{# request jupyter connected to balancer of proper zope family -#}
{# request jupyter connected to balancer of proper zope family -#}
{{ request('jupyter', 'jupyter', 'jupyter', {}, key_config={'erp5-url': 'request-balancer:connection-' ~ jupyter_zope_family}) }}
{{ request('jupyter', 'jupyter', 'jupyter', { 'erp5-hateoas-url': jupyter_hateoas_url }, key_config={'erp5-url': 'request-balancer:connection-' ~ jupyter_zope_family }) }}
#{{ request('jupyter', 'jupyter', 'jupyter', {}, key_config={'erp5-url': 'request-balancer:connection-' ~ jupyter_zope_family }) }}
{% if has_frontend -%}
{% if has_frontend -%}
[frontend-jupyter]
[frontend-jupyter]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment