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
Xiaohe Cao
slapos
Commits
a26f0b18
Commit
a26f0b18
authored
Apr 01, 2016
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix ipython notebook instance with monitor
parent
5e418da4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
software/ipython_notebook/instance.cfg.in
software/ipython_notebook/instance.cfg.in
+12
-2
software/ipython_notebook/software.cfg
software/ipython_notebook/software.cfg
+1
-1
No files found.
software/ipython_notebook/instance.cfg.in
View file @
a26f0b18
...
@@ -80,11 +80,18 @@ mode = 0744
...
@@ -80,11 +80,18 @@ mode = 0744
context =
context =
raw config_cfg ${buildout:directory}/knowledge0.cfg
raw config_cfg ${buildout:directory}/knowledge0.cfg
[monitor-instance-parameter]
monitor-base-url = ${monitor-frontend-promise:url}
# XXX Monitor will request frontend and check frontend promise
# If required use ipv6 url bellow
#monitor-base-url = ${monitor-httpd-conf-parameter:url}
cors-domains = ${slap-parameter:monitor-cors-domains}
[monitor-conf-parameters]
[monitor-conf-parameters]
private-path-list +=
private-path-list +=
${instance-parameter:logfile}
${instance-parameter:logfile}
# XXX
first allow test to run
# XXX
need to convert this for new Monitor
[monitor-deploy-set-password-cgi]
[monitor-deploy-set-password-cgi]
<= dynamic-jinja2-template-base
<= dynamic-jinja2-template-base
template = {{ ipython_notebook_set_password_location }}/{{ ipython_notebook_set_password_filename }}
template = {{ ipython_notebook_set_password_location }}/{{ ipython_notebook_set_password_filename }}
...
@@ -96,7 +103,7 @@ context =
...
@@ -96,7 +103,7 @@ context =
raw python_executable {{ bin_directory }}/ipython
raw python_executable {{ bin_directory }}/ipython
# key pwd monitor-directory:knowledge0-cgi
# key pwd monitor-directory:knowledge0-cgi
key this_file :filename
key this_file :filename
key httpd_graceful cgi-httpd-graceful-wrapper:rendered
#
key httpd_graceful cgi-httpd-graceful-wrapper:rendered
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
@@ -146,3 +153,6 @@ context =
...
@@ -146,3 +153,6 @@ context =
template = {{ custom_js_location }}/{{ custom_js_filename }}
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
[slap-parameter]
monitor-cors-domains = monitor.node.vifib.com
software/ipython_notebook/software.cfg
View file @
a26f0b18
...
@@ -60,7 +60,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -60,7 +60,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 =
18191556b80360c1e8632ca759e17385
md5sum =
060487563061b596af08815bf146190b
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
...
...
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