From 47e168f6f10a6cc7419865775c9619260c68e11c Mon Sep 17 00:00:00 2001 From: Mayoro Diagne <mayoro@nexedi.com> Date: Sat, 21 Apr 2012 23:49:09 +0000 Subject: [PATCH] use new version of glpi 0.83.1, use relative path of stack and remove downloadcache-workaround section --- software/glpi/instance.cfg | 1 - software/glpi/software.cfg | 34 ++++------------------------------ 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/software/glpi/instance.cfg b/software/glpi/instance.cfg index fa0ebbb9e..9495bde7e 100644 --- a/software/glpi/instance.cfg +++ b/software/glpi/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/glpi/software.cfg b/software/glpi/software.cfg index 6da46102c..72bd6e13a 100644 --- a/software/glpi/software.cfg +++ b/software/glpi/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 = https://forge.indepnet.net/attachments/download/974/glpi-0.80.4.tar.gz -md5sum = 8d6e4242c7079fcaaab734937e8d5a36 -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 = https://forge.indepnet.net/attachments/download/1151/glpi-0.83.1.tar.gz +md5sum = 3f9cfb11c09c457a0f0a8fa1563b45a7 [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 -- 2.30.9