Update Release Candidate

software/jupyter/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = f33fc954eba47b5ddbebc72c453304e3
+md5sum = de37ec3d4adb0be4c67bcc7397f27c91
 
 [instance-jupyter]
 filename = instance-jupyter.cfg.in

software/jupyter/instance.cfg.in

@@ -22,7 +22,7 @@ cert = $${slap-connection:cert-file}
 [instance-jupyter]
 recipe = slapos.recipe.template:jinja2
 filename = instance-jupyter.cfg.in
-template = ${instance:_profile_base_location_}/$${:filename}
+template = ${instance-jupyter:location}/$${:filename}
 rendered = $${buildout:directory}/template.cfg
 mode = 0644
 context =

software/jupyter/software.cfg

@@ -46,6 +46,9 @@ url =  ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
+[instance-jupyter]
+<= download-file-base
+
 [versions]
 Pygments = 2.7.2
 astor = 0.5

stack/erp5/buildout.hash.cfg

@@ -72,13 +72,9 @@ md5sum = cc19560b9400cecbd23064d55c501eec
 filename = instance.cfg.in
 md5sum = b5ac16fdeed8863e465e955ba6d1e12a
 
-[monitor-template-dummy]
-filename = dummy.cfg
-md5sum = 68b329da9893e34099c7d8ad5cb9c940
-
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 5ea4bcdf74fb429f254af8e8fb7b38a3
+md5sum = edfd681e3a477855a581f8d01c717a92
 
 [template-zeo]
 filename = instance-zeo.cfg.in

stack/erp5/dummy.cfg

-

stack/erp5/instance-erp5.cfg.in

@@ -64,9 +64,8 @@ config-name = {{ name }}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
-etc = ${buildout:directory}/etc
-plugin = ${:etc}/plugin
-service-on-watch = ${:etc}/service
+bin = ${buildout:directory}/bin
+service-on-watch = ${buildout:directory}/etc/service
 srv = ${buildout:directory}/srv
 backup-caucased = ${:srv}/backup/caucased