From beb9b71ab4a530fb45208509d342fe0a9dbfda0f Mon Sep 17 00:00:00 2001 From: Mayoro Diagne <mayoro@nexedi.com> Date: Wed, 25 Apr 2012 06:30:25 +0000 Subject: [PATCH] update fengoffice version, simplify software configuration and instance --- software/fengoffice/instance.cfg | 1 - software/fengoffice/software.cfg | 36 +++++--------------------------- 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/software/fengoffice/instance.cfg b/software/fengoffice/instance.cfg index fa0ebbb9e..9495bde7e 100644 --- a/software/fengoffice/instance.cfg +++ b/software/fengoffice/instance.cfg @@ -7,7 +7,6 @@ parts = instance [instance] recipe = ${instance-recipe:egg}:${instance-recipe:module} source = ${application:location} -lampconfigure_directory = ${buildout:bin-directory}/lampconfigure httpd_binary = ${apache:location}/bin/httpd mysql_binary = ${mariadb:location}/bin/mysql diff --git a/software/fengoffice/software.cfg b/software/fengoffice/software.cfg index 07ac34f51..bfbf70794 100644 --- a/software/fengoffice/software.cfg +++ b/software/fengoffice/software.cfg @@ -7,21 +7,14 @@ parts = mariadb eggs instance-recipe-egg - downloadcache-workaround extends = - http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/lamp.cfg - http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/shacache-client.cfg + ../../stack/lamp.cfg [application] -recipe = slapos.recipe.build -url = http://ignum.dl.sourceforge.net/project/opengoo/fengoffice/fengoffice_2.0.0beta2/fengoffice_2.0.0beta2.zip -md5sum = a8125c8a945531f6e9bcd8fae4a8f509 -script = - if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ') - extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum'))) - workdir = guessworkdir(extract_dir) - self.copyTree(workdir, "${buildout:parts-directory}/${:_buildout_section_name_}") +recipe = slapos.recipe.build:download-unpacked +url = http://freefr.dl.sourceforge.net/project/opengoo/fengoffice/fengoffice_2.0.0/fengoffice_2.0.0.zip +md5sum = 2f673962ac377da7942ba8a09429ddbf [instance-recipe] egg = slapos.cookbook @@ -39,23 +32,4 @@ mode = 0644 [instance-recipe-egg] recipe = zc.recipe.egg eggs = - ${mysql-python:egg} - ${instance-recipe:egg} - slapos.toolbox[lampconfigure] - -[versions] -# Use SlapOS patched zc.buildout -zc.buildout = 1.5.3-dev-SlapOS-010 -slapos.cookbook = 0.32 - -[downloadcache-workaround] -# workaround irritating problem of hexagonit.recipe.cmmi which automatically -# creates download cache, which in turn switches builout to "semi-offline" mode -recipe = plone.recipe.command -# in hexagonit.recipe.cmmi if there is no ${buildout:download-cache} set it resolves -# to ${buildout:directory}/downloads but this variable is available late, that's -# why it is hardcoded only for required case -download-cache = ${buildout:directory}/downloads -command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0 -update-command = ${:command} -stop-on-error = True + ${instance-recipe:egg} \ No newline at end of file -- 2.30.9