Commit 9a0ca073 authored by Jérome Perrin's avatar Jérome Perrin

software/*: make extra-eggs a software section

Despite the name, this section was inherited from monitor, but now that
we fixed monitor to prefix the sections, this section is no longer
extended from monitor, but defined in softwares
parent 86af5982
...@@ -38,9 +38,9 @@ parts += ...@@ -38,9 +38,9 @@ parts +=
proxy-by-url proxy-by-url
http-proxy http-proxy
# Extent extra-eggs.
[extra-eggs] [extra-eggs]
eggs += recipe = zc.recipe.egg
eggs =
websockify websockify
erp5.util erp5.util
......
...@@ -73,12 +73,7 @@ depends = ${caddyprofiledeps-develop:recipe} ...@@ -73,12 +73,7 @@ depends = ${caddyprofiledeps-develop:recipe}
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
caddyprofiledeps caddyprofiledeps
# Extent extra-eggs.
[extra-eggs]
eggs +=
websockify websockify
erp5.util
collective.recipe.shelloutput collective.recipe.shelloutput
[template-common] [template-common]
......
...@@ -41,7 +41,8 @@ parts = ${:common-parts} ...@@ -41,7 +41,8 @@ parts = ${:common-parts}
#XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu #XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu
[extra-eggs] [extra-eggs]
eggs += recipe = zc.recipe.egg
eggs =
${python-cffi:egg} ${python-cffi:egg}
websockify websockify
slapos.cookbook slapos.cookbook
......
...@@ -51,6 +51,7 @@ common-parts = ...@@ -51,6 +51,7 @@ common-parts =
parts = parts =
${:common-parts} ${:common-parts}
[template-base] [template-base]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
...@@ -143,7 +144,9 @@ filename = slapos-slapuser-script.in ...@@ -143,7 +144,9 @@ filename = slapos-slapuser-script.in
output = ${buildout:directory}/buildout-shared-part-list output = ${buildout:directory}/buildout-shared-part-list
[extra-eggs] [extra-eggs]
eggs += recipe = zc.recipe.egg
interpreter = pythonwitheggs
eggs =
erp5.util erp5.util
lock-file lock-file
slapos.recipe.build slapos.recipe.build
...@@ -155,6 +158,10 @@ eggs += ...@@ -155,6 +158,10 @@ eggs +=
# BBB: eggs used as recipe should be kept otherwise sections depending # BBB: eggs used as recipe should be kept otherwise sections depending
# on it can't be uninstalled # on it can't be uninstalled
collective.recipe.shelloutput collective.recipe.shelloutput
scripts =
gunicorn
supervisord
supervisorctl
[versions] [versions]
Flask-Auth = 0.85 Flask-Auth = 0.85
......
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