From 305f4a5284e89e321112cc19f37712b638cd531e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Fri, 30 Mar 2012 12:26:10 +0200 Subject: [PATCH] Simplify lamp-template example after stack simplification --- software/lamp-template/software.cfg | 86 ----------------------------- 1 file changed, 86 deletions(-) diff --git a/software/lamp-template/software.cfg b/software/lamp-template/software.cfg index a27faf278..de0023c8e 100644 --- a/software/lamp-template/software.cfg +++ b/software/lamp-template/software.cfg @@ -7,7 +7,6 @@ parts = mariadb eggs instance-recipe-egg - downloadcache-workaround extends = ../../stack/lamp.cfg @@ -18,7 +17,6 @@ url = Student shall put here url of zipped or tarballed web page or application md5sum = Student may put here md5sum of this file, this is good idea #If provided tarball does not contain top directory, option shall be changed to false strip-top-level-dir = true -#extract-directory = [application-template] recipe = slapos.recipe.download @@ -43,91 +41,7 @@ url = ${:_profile_base_location_}/instance.cfg output = ${buildout:directory}/template.cfg mode = 0644 -[mariadb] -keep-compile-dir = false - [instance-recipe-egg] recipe = zc.recipe.egg eggs = ${instance-recipe:egg} - -[versions] -# Use SlapOS patched zc.buildout -zc.buildout = 1.6.0-dev-SlapOS-003 -# Generated by buildout-versions -Jinja2 = 2.6 -Werkzeug = 0.8.2 -buildout-versions = 1.7 -hexagonit.recipe.cmmi = 1.5.0 -meld3 = 0.6.8 -plone.recipe.command = 1.1 -slapos.cookbook = 0.20 -slapos.recipe.build = 0.7 -slapos.recipe.download = 1.0.dev-r4053 -slapos.recipe.template = 2.2 - -# Required by: -# slapos.core==0.21 -Flask = 0.8 - -# Required by: -# slapos.cookbook==0.38 -PyXML = 0.8.4 - -# Required by: -# hexagonit.recipe.cmmi==1.5.0 -hexagonit.recipe.download = 1.5.0 - -# Required by: -# slapos.cookbook==0.38 -# slapos.core==0.21 -# xml-marshaller==0.9.7 -lxml = 2.3.3 - -# Required by: -# slapos.cookbook==0.38 -netaddr = 0.7.6 - -# Required by: -# slapos.core==0.21 -netifaces = 0.6 - -# Required by: -# slapos.cookbook==0.38 -# slapos.core==0.21 -# zc.buildout==1.6.0-dev-SlapOS-003 -# zc.recipe.egg==1.3.2 -setuptools = 0.6c12dev-r88846 - -# Required by: -# slapos.cookbook==0.38 -slapos.core = 0.21 - -# Required by: -# slapos.core==0.21 -supervisor = 3.0a12 - -# Required by: -# slapos.cookbook==0.38 -xml-marshaller = 0.9.7 - -# Required by: -# slapos.cookbook==0.38 -zc.recipe.egg = 1.3.2 - -# Required by: -# slapos.core==0.21 -zope.interface = 3.8.0 - -[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