diff --git a/software/xwiki/software.cfg b/software/xwiki/software.cfg index 4ce0de8daddaca48c6ec01948357f8262b4e9f4a..ba827197d921a259a0ea9e1f0d29f21d2c862333 100644 --- a/software/xwiki/software.cfg +++ b/software/xwiki/software.cfg @@ -2,18 +2,12 @@ extends = ../../stack/tomcat.cfg -find-links = - http://www.nexedi.org/static/packages/source/slapos.buildout/ - -versions = versions - [instance-recipe] egg = slapos.cookbook module = xwiki [instance-recipe-egg] recipe = zc.recipe.egg -python = python2.7 eggs = ${instance-recipe:egg} [template] diff --git a/stack/tomcat.cfg b/stack/tomcat.cfg index cd3752066edcdba5e1de339966adaf72cd67839c..2757eedb2d8ca64affd61478512e9bc62053ad50 100644 --- a/stack/tomcat.cfg +++ b/stack/tomcat.cfg @@ -3,24 +3,8 @@ extends = ../component/lxml-python/buildout.cfg ../component/java/buildout.cfg ../component/mysql-5.1/buildout.cfg - ../component/python-2.7/buildout.cfg ../component/tomcat/buildout.cfg - ../stack/shacache-client.cfg - -find-links += - http://www.nexedi.org/static/packages/source/slapos.buildout/ - -# Use only quite well working sites. -allow-hosts = - *.nexedi.org - *.python.org - *.sourceforge.net - dist.repoze.org - effbot.org - github.com - peak.telecommunity.com - psutil.googlecode.com - www.dabeaz.com + ../stack/slapos.cfg parts = template @@ -45,7 +29,6 @@ md5sum = 22e1aff6104bb9006f8744a02bf73124 [eggs] recipe = zc.recipe.egg -python = python2.7 eggs = ${lxml-python:egg} slapos.cookbook