fix monitor in jupyter: allow erp5 sr to compile first

software/ipython_notebook/instance.cfg.in

@@ -2,27 +2,6 @@
 parts =
   instance
   publish-connection-parameter
-## Monitoring part XXX whe should not have to specify all parts like this
-## Parts to add for monitoring
-  certificate-authority
-  cron
-  cron-entry-monitor
-  cron-entry-rss
-  deploy-index
-  deploy-settings-cgi
-  deploy-status-cgi
-  deploy-status-history-cgi
-  setup-static-files
-  certificate-authority
-  zero-parameters
-  public-symlink
-  cgi-httpd-wrapper
-  cgi-httpd-graceful-wrapper
-  monitor-promise
-  monitor-instance-log-access
-## Monitor for ipython
-  monitor-current-log-access
-  monitor-deploy-set-password-cgi
   erp5-kernel
   kernel-json
   custom-js
@@ -101,20 +80,21 @@ mode = 0744
 context =
   raw config_cfg ${buildout:directory}/knowledge0.cfg
 
-[monitor-current-log-access]
-< = monitor-directory-access
-source = ${instance-parameter:logfile}
+[monitor-conf-parameters]
+private-path-list += 
+  ${instance-parameter:logfile}
 
+# XXX first allow test to run
 [monitor-deploy-set-password-cgi]
 <= dynamic-jinja2-template-base
 template = {{ ipython_notebook_set_password_location }}/{{ ipython_notebook_set_password_filename }}
-rendered = ${monitor-directory:knowledge0-cgi}/${:filename}
+rendered = ${directory:etc}/${:filename}
 filename = ipython-notebook-password.cgi
 mode = 0744
 context =
   raw config_cfg ${buildout:directory}/knowledge0.cfg
   raw python_executable {{ bin_directory }}/ipython
-  key pwd monitor-directory:knowledge0-cgi
+#  key pwd monitor-directory:knowledge0-cgi
   key this_file :filename
   key httpd_graceful cgi-httpd-graceful-wrapper:rendered
 
@@ -136,7 +116,10 @@ erp5_kernel_dir = ${:ipython_kernel_dir}/ERP5
 [publish-connection-parameter]
 recipe = slapos.cookbook:publish.serialised
 url = https://[${instance-parameter:host}]:${instance-parameter:port}
-monitor_url = ${monitor-parameters:url}
+monitor-base-url = ${publish:monitor-base-url}
+monitor-url = ${publish:monitor-url}
+monitor-user = ${publish:monitor-user}
+monitor-password = ${publish:monitor-password}
 
 [erp5-kernel]
 <= dynamic-jinja2-template-base

software/ipython_notebook/software.cfg

@@ -60,12 +60,12 @@ recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg.in
 rendered = ${buildout:directory}/template.cfg
 mode = 0644
-md5sum = c6b82a386a72ed72301302c3132ffb71
+md5sum = 18191556b80360c1e8632ca759e17385
 context =
   key bin_directory buildout:bin-directory
   key develop_eggs_directory buildout:develop-eggs-directory
   key eggs_directory buildout:eggs-directory
-  key monitor_template monitor-template:output
+  key monitor_template monitor-template:rendered
   key openssl_output openssl-output:openssl
   key python_executable python2.7:executable
   key ipython_notebook_config_location ipython-notebook-config:location