diff --git a/software/trac-svn/instance-trac.cfg b/software/trac-svn/instance-trac.cfg index 4293ac562dbd462f9aaab50cf28b80e197a217de..82f6040971a1c325eb7096f4e9ac2e80d3f67566 100644 --- a/software/trac-svn/instance-trac.cfg +++ b/software/trac-svn/instance-trac.cfg @@ -324,7 +324,7 @@ user-list = $${slap-parameter:trac-user-list} recipe = slapos.cookbook:wrapper command-line = ${apache:location}/bin/httpd -DFOREGROUND -f "$${httpd-conf:output}" environment = PYTHONPATH=${subversion-1.9:location}/lib/svn-python:$${inittrac:python_path} - PATH=${python2.7:location}/bin:$PATH + PATH=${python2.7:location}/bin:%(PATH)s wrapper-path = $${basedirectory:services}/httpd wait-for-files = $${inittrac:file-status} diff --git a/software/trac-svn/software.cfg b/software/trac-svn/software.cfg index 4fa87cfc20be3752a85013ba768be0051ba5280e..27ce5d233eb422cc7ff2c93b6a7c970561a0b36d 100644 --- a/software/trac-svn/software.cfg +++ b/software/trac-svn/software.cfg @@ -44,9 +44,13 @@ extends = allow-hosts += *.edgewall.org *.edgewall.com + +[python-2.7] +executable = ${python2.7:location}/bin/python2.7 [instance-egg] recipe = zc.recipe.egg +python = python-2.7 eggs = ${mysql-python:egg} slapos.toolbox @@ -115,7 +119,7 @@ md5sum = bc6ed91a1862a10af661713aa0691848 recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-trac.cfg output = ${buildout:directory}/template-trac.cfg -md5sum = 4c5caf5cfb7567964c54cd57adba46a4 +md5sum = 7525cd9596527a22cf3447e38771a3c5 mode = 0644 [create-svn-repo]