Commit 81ad9e57 authored by Sebastian's avatar Sebastian

ipython_notebook: Update software and instance for standalone ipython_notebook

parent 05135d13
...@@ -7,9 +7,11 @@ parts = ...@@ -7,9 +7,11 @@ parts =
erp5-kernel erp5-kernel
kernel-json kernel-json
custom-js custom-js
monitor-base jiocontents-nbextension-symlink
extends = jiocontents-erp5-config
{{ monitor_template_rendered }}/template-monitor.cfg # monitor-base
#extends =
# {{ monitor_template_rendered }}/template-monitor.cfg
eggs-directory = {{ eggs_directory }} eggs-directory = {{ eggs_directory }}
...@@ -26,7 +28,9 @@ cert = ${slap-connection:cert-file} ...@@ -26,7 +28,9 @@ cert = ${slap-connection:cert-file}
# ERP5 URL to use in Jupyter by default # ERP5 URL to use in Jupyter by default
# default value is empty - which means no default ERP5 URL # default value is empty - which means no default ERP5 URL
configuration.erp5-url = configuration.erp5-url =
# URL for the erp5 hateoas to be used for storage of notebooks
configuration.erp5-hateoas-url = default
[instance-parameter] [instance-parameter]
port = 8888 port = 8888
...@@ -74,7 +78,9 @@ command-line = ...@@ -74,7 +78,9 @@ command-line =
wrapper-path = ${directory:service}/ipython_notebook wrapper-path = ${directory:service}/ipython_notebook
parameters-extra = true parameters-extra = true
# Explicitly define IPython Directory to be used while starting ipython notebook # Explicitly define IPython Directory to be used while starting ipython notebook
environment = IPYTHONDIR=${directory:ipython_dir} environment =
IPYTHONDIR=${directory:ipython_dir}
JUPYTER_CONFIG_DIR=${directory:ipython_dir}
[ipython-notebook-config] [ipython-notebook-config]
<= dynamic-jinja2-template-base <= dynamic-jinja2-template-base
...@@ -98,6 +104,8 @@ notebook_dir = ${:var}/notebooks ...@@ -98,6 +104,8 @@ notebook_dir = ${:var}/notebooks
ipython_dir = ${:home}/ipython ipython_dir = ${:home}/ipython
ipython_kernel_dir = ${:ipython_dir}/kernels ipython_kernel_dir = ${:ipython_dir}/kernels
erp5_kernel_dir = ${:ipython_kernel_dir}/ERP5 erp5_kernel_dir = ${:ipython_kernel_dir}/ERP5
nbextensions_dir = ${:ipython_dir}/nbextensions
jiocontents_dir = ${:nbextensions_dir}/jiocontents
[ipython_notebook] [ipython_notebook]
# This part is called like this because knowledge0.write uses the part name for # This part is called like this because knowledge0.write uses the part name for
...@@ -112,9 +120,9 @@ filename = knowledge0.cfg ...@@ -112,9 +120,9 @@ filename = knowledge0.cfg
password = password =
[monitor-instance-parameter] [monitor-instance-parameter]
monitor-base-url = ${monitor-frontend-promise:url} # monitor-base-url = ${monitor-frontend-promise:url}
# In case you're using a developer instance you should edit these in: # In case you're using a developer instance you should edit these in:
# monitor-base-url = ${monitor-httpd-conf-parameter:url} monitor-base-url = ${monitor-httpd-conf-parameter:url}
# cors-domains = softinstXXXXX.host.vifib.net (or equivalent) # cors-domains = softinstXXXXX.host.vifib.net (or equivalent)
# interface-url = https://softinstXXXXX.host.vifib.net/erp5/web_site_module/monitoring_rjs_unsafe # interface-url = https://softinstXXXXX.host.vifib.net/erp5/web_site_module/monitoring_rjs_unsafe
instance-configuration = instance-configuration =
...@@ -123,6 +131,7 @@ instance-configuration = ...@@ -123,6 +131,7 @@ instance-configuration =
[publish-connection-parameter] [publish-connection-parameter]
recipe = slapos.cookbook:publish.serialised recipe = slapos.cookbook:publish.serialised
url = https://[${instance-parameter:host}]:${instance-parameter:port} url = https://[${instance-parameter:host}]:${instance-parameter:port}
erp5-hateoas-url = ${slapconfiguration:configuration.erp5-hateoas-url}
[erp5-kernel] [erp5-kernel]
<= dynamic-jinja2-template-base <= dynamic-jinja2-template-base
...@@ -150,3 +159,14 @@ template = {{ custom_js_location }}/{{ custom_js_filename }} ...@@ -150,3 +159,14 @@ template = {{ custom_js_location }}/{{ custom_js_filename }}
rendered = ${directory:ipython_dir}/profile_default/static/custom/custom.js rendered = ${directory:ipython_dir}/profile_default/static/custom/custom.js
mode = 0744 mode = 0744
[jiocontents-erp5-config]
<= dynamic-jinja2-template-base
template = {{ jiocontents_config_location }}/{{ jiocontents_config_filename }}
rendered = ${directory:jiocontents_dir}/jiocontents_erp5_config.js
context =
key erp5_url slapconfiguration:configuration.erp5-hateoas-url
[jiocontents-nbextension-symlink]
recipe = cns.recipe.symlink
symlink = {{ jiocontents_nbextension_location }}/jiocontents = ${directory:jiocontents_dir}/src
autocreate = true
...@@ -9,7 +9,8 @@ extends = ...@@ -9,7 +9,8 @@ extends =
../../component/openssl/buildout.cfg ../../component/openssl/buildout.cfg
../../component/seaborn/buildout.cfg ../../component/seaborn/buildout.cfg
../../component/git/buildout.cfg ../../component/git/buildout.cfg
../../stack/monitor/buildout.cfg # ../../stack/monitor/buildout.cfg
index = https://pypi.python.org/simple/
parts = parts =
slapos-cookbook slapos-cookbook
ipython-notebook ipython-notebook
...@@ -29,6 +30,7 @@ eggs += ...@@ -29,6 +30,7 @@ eggs +=
${seaborn:egg} ${seaborn:egg}
${statsmodels:egg} ${statsmodels:egg}
patsy patsy
cns.recipe.symlink
[download-file-base] [download-file-base]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
...@@ -78,7 +80,7 @@ recipe = slapos.recipe.template:jinja2 ...@@ -78,7 +80,7 @@ recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg.in template = ${:_profile_base_location_}/instance.cfg.in
rendered = ${buildout:directory}/template.cfg rendered = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
md5sum = b564e553811db272be681c331b270bbe md5sum = ff1cd3e9d73e4b5892009a8a67de2b38
context = context =
key bin_directory buildout:bin-directory key bin_directory buildout:bin-directory
key develop_eggs_directory buildout:develop-eggs-directory key develop_eggs_directory buildout:develop-eggs-directory
......
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