Commit 513c3cc9 authored by Cédric de Saint Martin's avatar Cédric de Saint Martin

Merge branch 'agent'

parents 417f37f8 6423cff9
...@@ -6,8 +6,18 @@ eggs-directory = ${buildout:eggs-directory} ...@@ -6,8 +6,18 @@ eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true offline = true
[directory]
recipe = slapos.cookbook:mkdirectory
etc = $${buildout:directory}/etc
run = $${:etc}/run
agentlog = $${buildout:directory}/var/log/agent
srv = $${buildout:directory}/srv
bin = $${buildout:directory}/bin
[instance] [instance]
recipe = ${instance-recipe:egg}:${instance-recipe:module} recipe = slapos.cookbook:agent
agent_binary = ${buildout:directory}/bin/agent agent_binary = ${buildout:directory}/bin/agent
pidfile = $${directory:srv}/agent.pid pidfile = $${directory:srv}/agent.pid
log = $${directory:agentlog}/agent.log log = $${directory:agentlog}/agent.log
...@@ -21,11 +31,3 @@ default_max_install_duration = $${slap-parameter:default_max_install_duration} ...@@ -21,11 +31,3 @@ default_max_install_duration = $${slap-parameter:default_max_install_duration}
default_max_uninstall_duration = $${slap-parameter:default_max_uninstall_duration} default_max_uninstall_duration = $${slap-parameter:default_max_uninstall_duration}
default_max_request_duration = $${slap-parameter:default_max_request_duration} default_max_request_duration = $${slap-parameter:default_max_request_duration}
default_max_destroy_duration = $${slap-parameter:default_max_destroy_duration} default_max_destroy_duration = $${slap-parameter:default_max_destroy_duration}
[directory]
recipe = slapos.cookbook:mkdirectory
etc = $${buildout:directory}/etc
run = $${:etc}/run
agentlog = $${buildout:directory}/var/log/agent
srv = $${buildout:directory}/srv
bin = $${buildout:directory}/bin
...@@ -12,52 +12,32 @@ parts = ...@@ -12,52 +12,32 @@ parts =
template template
template-agent template-agent
slapos.cookbook-repository slapos.cookbook-repository
check-recipe
slapos.toolbox-repository slapos.toolbox-repository
check-recipe-toolbox check-recipe
instance-recipe-egg slapos-cookbook
script script
# Local development # Local development
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = plone.recipe.command recipe = slapos.recipe.build:gitclone
stop-on-error = true repository = http://git.erp5.org/repos/slapos.git
branch = agent branch = agent
location = ${buildout:parts-directory}/${:_buildout_section_name_} git-executable = ${git:location}/bin/git
command = ${git:location}/bin/git clone --branch ${:branch} --quiet http://git.erp5.org/repos/slapos.git ${:location}
update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
[check-recipe]
recipe = plone.recipe.command
stop-on-error = true
update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
[slapos.toolbox-repository] [slapos.toolbox-repository]
recipe = plone.recipe.command recipe = slapos.recipe.build:gitclone
stop-on-error = true repository = http://git.erp5.org/repos/slapos.toolbox.git
branch = agent branch = agent3
location = ${buildout:parts-directory}/${:_buildout_section_name_} git-executable = ${git:location}/bin/git
command = ${git:location}/bin/git clone --branch ${:branch} --quiet http://git.erp5.org/repos/slapos.toolbox.git ${:location}
update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
[check-recipe-toolbox] [check-recipe]
recipe = plone.recipe.command recipe = plone.recipe.command
stop-on-error = true stop-on-error = true
update-command = ${:command} update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link command =
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link;
[instance-recipe] grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
# XXX-Cedric: it can use newest slapos.cfg to not have duplication
egg = slapos.cookbook
module = agent
[instance-recipe-egg]
# XXX-Cedric: it can use newest slapos.cfg to not have duplication
recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
${instance-recipe:egg}
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
...@@ -70,7 +50,7 @@ mode = 0644 ...@@ -70,7 +50,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-agent.cfg url = ${:_profile_base_location_}/instance-agent.cfg
output = ${buildout:directory}/template-agent.cfg output = ${buildout:directory}/template-agent.cfg
md5sum = fd9670d8473be402b10990398b553b00 md5sum = 7c5c43eb98d5a11961d72fce97a8e67b
mode = 0644 mode = 0644
[script] [script]
......
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