IPython Notebook: Added publish parameter erp5_url for default instance

software/ipython_notebook/instance-default.cfg.in

@@ -13,9 +13,12 @@ recipe = slapos.cookbook:request
 name = IPython Notebook
 software-url = $${slap-connection:software-release-url}
 software-type = notebook
-return = url
+return =
+  url
+  erp5_url
 sla-computer_guid = $${slap-connection:computer-id}
 
 [publish-connection-parameter]
 recipe = slapos.cookbook:publish
-notebook_url = $${request-ipythonnotebook:connection-url}
\ No newline at end of file
+notebook_url = $${request-ipythonnotebook:connection-url}
+erp5_url = $${request-ipythonnotebook:connection-erp5_url}
\ No newline at end of file

software/ipython_notebook/instance-notebook.cfg.in

@@ -32,19 +32,6 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-[jinja2-template-base]
-recipe = slapos.recipe.template:jinja2
-rendered = $${buildout:directory}/$${:filename}
-extra-context =
-context =
-    import json_module json
-    key eggs_directory buildout:eggs-directory
-    key develop_eggs_directory buildout:develop-eggs-directory
-    key slap_software_type slap-parameters:slap-software-type
-    key slapparameter_dict slap-parameters:configuration
-    key slave_instance_list slap-parameters:slave-instance-list
-    $${:extra-context}
-
 [slapconfiguration]
 recipe = slapos.cookbook:slapconfiguration
 computer = $${slap-connection:computer-id}

software/ipython_notebook/software.cfg

@@ -56,12 +56,12 @@ output = ${buildout:directory}/instance.cfg
 [instance-default]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-default.cfg.in
-output = ${buildout:directory}/template-default.cfg
+output = ${buildout:directory}/instance-default.cfg
 
 [instance-notebook]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-notebook.cfg.in
-output = ${buildout:directory}/template-notebook.cfg
+output = ${buildout:directory}/instance-notebook.cfg
 
 [erp5-kernel]
 recipe = hexagonit.recipe.download