Commit b478b403 authored by Julien Muchembled's avatar Julien Muchembled Committed by Bryton Lacquement

backupserver,re6stnet: fix missing eggs

This fixes a regression in commit a7a36453
("Clean up some zc.recipe.egg sections installing the same scripts/interpreter").
parent 56999c25
...@@ -42,7 +42,7 @@ md5sum = 432d22bb0f67df5203bbc5d1134a952b ...@@ -42,7 +42,7 @@ md5sum = 432d22bb0f67df5203bbc5d1134a952b
[template-update-rss-script] [template-update-rss-script]
filename = template-update-rss.sh.in filename = template-update-rss.sh.in
md5sum = 80b3746568bc8e308a1f337bdaa2441c md5sum = ae4a0043414336a521b524d9c95f1c68
[template-pullrdiffbackup] [template-pullrdiffbackup]
filename = instance-pullrdiffbackup.cfg.in filename = instance-pullrdiffbackup.cfg.in
......
...@@ -16,7 +16,6 @@ extends = ...@@ -16,7 +16,6 @@ extends =
../../stack/monitor/buildout.cfg ../../stack/monitor/buildout.cfg
parts = parts =
extra-eggs
rdiff-backup rdiff-backup
dcron dcron
logrotate logrotate
...@@ -29,12 +28,12 @@ parts = ...@@ -29,12 +28,12 @@ parts =
template-crontab-line template-crontab-line
slapos-cookbook slapos-cookbook
[extra-eggs] [rssgen-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
interpreter = pythonforrssgen interpreter = python-${:_buildout_section_name_}
eggs = eggs =
PyRSS2Gen PyRSS2Gen
python_dateutil python-dateutil
########################################################## ##########################################################
# Service startup scripts and configuration files # Service startup scripts and configuration files
......
...@@ -4,7 +4,7 @@ STATUS_DIR=$${directory:status} ...@@ -4,7 +4,7 @@ STATUS_DIR=$${directory:status}
RSS_DIR=$${directory:www} RSS_DIR=$${directory:www}
TAIL=${coreutils-output:tail} TAIL=${coreutils-output:tail}
PYTHON=${buildout:directory}/bin/${extra-eggs:interpreter} PYTHON=${buildout:bin-directory}/${rssgen-eggs:interpreter}
STATUS2RSS=${status2rss:output} STATUS2RSS=${status2rss:output}
BASENAME=${coreutils-output:basename} BASENAME=${coreutils-output:basename}
......
...@@ -17,30 +17,13 @@ extends = ...@@ -17,30 +17,13 @@ extends =
parts += parts +=
slapos-cookbook slapos-cookbook
eggs
dash dash
template template
[eggs] [re6st-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
interpreter = python-${:_buildout_section_name_}
eggs = eggs =
${lxml-python:egg}
${pycurl:egg}
${python-cryptography:egg}
slapos.toolbox
scripts =
slapos-kill
monitor.bootstrap
monitor.collect
monitor.genstatus
monitor.configwrite
is-process-older-than-dependency-set
[extra-eggs]
recipe = zc.recipe.egg
interpreter = pythonwitheggs
eggs =
${lxml-python:egg}
${python-cffi:egg} ${python-cffi:egg}
${python-cryptography:egg} ${python-cryptography:egg}
pyOpenSSL pyOpenSSL
...@@ -70,7 +53,7 @@ context = ...@@ -70,7 +53,7 @@ context =
key template_wrapper template-wrapper:target key template_wrapper template-wrapper:target
key template_registry_run template-registry-run:target key template_registry_run template-registry-run:target
key monitor2_template_rendered monitor2-template:rendered key monitor2_template_rendered monitor2-template:rendered
raw python_with_eggs ${buildout:directory}/bin/${extra-eggs:interpreter} raw python_with_eggs ${buildout:bin-directory}/${re6st-eggs:interpreter}
[template-re6stnet] [template-re6stnet]
< = download-base < = download-base
......
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