Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
bc95011e
Commit
bc95011e
authored
Mar 05, 2014
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
specify 'python = python2.7' in stack/slapos.cfg:[buildout] only.
parent
c87690b9
Changes
21
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
32 additions
and
76 deletions
+32
-76
component/cloudooo/buildout.cfg
component/cloudooo/buildout.cfg
+1
-1
component/lxml-python/buildout.cfg
component/lxml-python/buildout.cfg
+1
-0
component/m2crypto/buildout.cfg
component/m2crypto/buildout.cfg
+1
-0
component/mysql-python/buildout.cfg
component/mysql-python/buildout.cfg
+1
-0
component/pil-python/buildout.cfg
component/pil-python/buildout.cfg
+1
-0
component/pycrypto-python/buildout.cfg
component/pycrypto-python/buildout.cfg
+1
-0
component/pysvn-python/buildout.cfg
component/pysvn-python/buildout.cfg
+1
-0
component/python-cffi/buildout.cfg
component/python-cffi/buildout.cfg
+1
-0
component/python-cryptography/buildout.cfg
component/python-cryptography/buildout.cfg
+1
-0
component/python-ldap-python/buildout.cfg
component/python-ldap-python/buildout.cfg
+1
-0
component/rdiff-backup/buildout.cfg
component/rdiff-backup/buildout.cfg
+2
-1
component/slapos/buildout.cfg
component/slapos/buildout.cfg
+2
-11
software/erp5testnode/software.cfg
software/erp5testnode/software.cfg
+1
-10
software/etherpad-lite/common.cfg
software/etherpad-lite/common.cfg
+1
-4
software/neoppod/software.cfg
software/neoppod/software.cfg
+0
-5
software/seleniumrunner/software.cfg
software/seleniumrunner/software.cfg
+2
-13
software/silverstripe/software.cfg
software/silverstripe/software.cfg
+1
-1
software/trac-svn/software.cfg
software/trac-svn/software.cfg
+1
-4
software/varnish/software.cfg
software/varnish/software.cfg
+2
-5
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+7
-21
stack/slapos.cfg
stack/slapos.cfg
+3
-0
No files found.
component/cloudooo/buildout.cfg
View file @
bc95011e
...
@@ -22,7 +22,7 @@ git-executable = ${git:location}/bin/git
...
@@ -22,7 +22,7 @@ git-executable = ${git:location}/bin/git
[cloudooo]
[cloudooo]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python =
python2.7
python =
${buildout:python}
extra-paths = ${cloudooo-repository:location}
extra-paths = ${cloudooo-repository:location}
eggs =
eggs =
${lxml-python:egg}
${lxml-python:egg}
...
...
component/lxml-python/buildout.cfg
View file @
bc95011e
...
@@ -12,6 +12,7 @@ PATH = ${libxslt:location}/bin:%(PATH)s
...
@@ -12,6 +12,7 @@ PATH = ${libxslt:location}/bin:%(PATH)s
[lxml-python]
[lxml-python]
recipe = zc.recipe.egg:custom
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = lxml
egg = lxml
rpath =
rpath =
...
...
component/m2crypto/buildout.cfg
View file @
bc95011e
...
@@ -10,6 +10,7 @@ parts =
...
@@ -10,6 +10,7 @@ parts =
[M2Crypto]
[M2Crypto]
recipe = zc.recipe.egg:custom
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = M2Crypto
egg = M2Crypto
environment = M2Crypto-env
environment = M2Crypto-env
rpath =
rpath =
...
...
component/mysql-python/buildout.cfg
View file @
bc95011e
...
@@ -12,6 +12,7 @@ PATH =${mariadb:location}/bin:%(PATH)s
...
@@ -12,6 +12,7 @@ PATH =${mariadb:location}/bin:%(PATH)s
[mysql-python]
[mysql-python]
recipe = zc.recipe.egg:custom
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = MySQL-python
egg = MySQL-python
depends =
depends =
${mariadb:version}
${mariadb:version}
...
...
component/pil-python/buildout.cfg
View file @
bc95011e
...
@@ -9,6 +9,7 @@ parts =
...
@@ -9,6 +9,7 @@ parts =
[pil-python]
[pil-python]
recipe = zc.recipe.egg:custom
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = PIL
egg = PIL
include-dirs =
include-dirs =
${freetype:location}/include
${freetype:location}/include
...
...
component/pycrypto-python/buildout.cfg
View file @
bc95011e
...
@@ -9,6 +9,7 @@ versions = versions
...
@@ -9,6 +9,7 @@ versions = versions
[pycrypto-python]
[pycrypto-python]
recipe = zc.recipe.egg:custom
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = pycrypto
egg = pycrypto
include-dirs =
include-dirs =
${gmp:location}/include
${gmp:location}/include
...
...
component/pysvn-python/buildout.cfg
View file @
bc95011e
...
@@ -8,6 +8,7 @@ parts =
...
@@ -8,6 +8,7 @@ parts =
[pysvn-python]
[pysvn-python]
recipe = zc.recipe.egg:custom
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg =
egg =
pysvn
pysvn
include-dirs =
include-dirs =
...
...
component/python-cffi/buildout.cfg
View file @
bc95011e
...
@@ -8,6 +8,7 @@ parts =
...
@@ -8,6 +8,7 @@ parts =
[python-cffi]
[python-cffi]
recipe = zc.recipe.egg:custom
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = cffi
egg = cffi
environment = python-cffi-env
environment = python-cffi-env
library-dirs =
library-dirs =
...
...
component/python-cryptography/buildout.cfg
View file @
bc95011e
...
@@ -9,6 +9,7 @@ parts =
...
@@ -9,6 +9,7 @@ parts =
[python-cryptography]
[python-cryptography]
recipe = zc.recipe.egg:custom
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = cryptography
egg = cryptography
environment = python-cryptography-env
environment = python-cryptography-env
...
...
component/python-ldap-python/buildout.cfg
View file @
bc95011e
...
@@ -8,6 +8,7 @@ extends =
...
@@ -8,6 +8,7 @@ extends =
[python-ldap-python]
[python-ldap-python]
recipe = zc.recipe.egg:custom
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = python-ldap
egg = python-ldap
rpath =
rpath =
${openldap:location}/lib
${openldap:location}/lib
...
...
component/rdiff-backup/buildout.cfg
View file @
bc95011e
...
@@ -7,6 +7,7 @@ parts =
...
@@ -7,6 +7,7 @@ parts =
[rdiff-backup-build]
[rdiff-backup-build]
recipe = zc.recipe.egg:custom
recipe = zc.recipe.egg:custom
python = ${buildout:python}
egg = rdiff-backup
egg = rdiff-backup
include-dirs =
include-dirs =
${librsync:location}/include/
${librsync:location}/include/
...
@@ -18,8 +19,8 @@ find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1
...
@@ -18,8 +19,8 @@ find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1
[rdiff-backup]
[rdiff-backup]
# Scripts only generation part for rdiff-backup
# Scripts only generation part for rdiff-backup
unzip = true
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python = ${buildout:python}
eggs =
eggs =
${rdiff-backup-build:egg}
${rdiff-backup-build:egg}
entry-points =
entry-points =
...
...
component/slapos/buildout.cfg
View file @
bc95011e
...
@@ -89,18 +89,9 @@ input = inline:
...
@@ -89,18 +89,9 @@ input = inline:
export PS1="[SlapOS env Active] $PS1"
export PS1="[SlapOS env Active] $PS1"
output = ${buildout:directory}/environment.sh
output = ${buildout:directory}/environment.sh
[lxml-python]
python = python2.7
[python-cffi]
python = python2.7
[python-cryptography]
python = python2.7
[slapos]
[slapos]
recipe = z3c.recipe.scripts
recipe = z3c.recipe.scripts
python =
python2.7
python =
${buildout:python}
eggs =
eggs =
${python-cffi:egg}
${python-cffi:egg}
${python-cryptography:egg}
${python-cryptography:egg}
...
@@ -134,9 +125,9 @@ scripts =
...
@@ -134,9 +125,9 @@ scripts =
[py]
[py]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python = ${buildout:python}
eggs =
eggs =
${slapos:eggs}
${slapos:eggs}
python = python2.7
interpreter = py
interpreter = py
scripts = py
scripts = py
...
...
software/erp5testnode/software.cfg
View file @
bc95011e
...
@@ -64,16 +64,7 @@ scripts =
...
@@ -64,16 +64,7 @@ scripts =
slapgrid-sr = slapos.grid.slapgrid:runSoftwareRelease
slapgrid-sr = slapos.grid.slapgrid:runSoftwareRelease
slapproxy = slapos.proxy:main
slapproxy = slapos.proxy:main
python = python2.7
python = ${buildout:python}
[lxml-python]
python = python2.7
[python-cffi]
python = python2.7
[python-cryptography]
python = python2.7
[template]
[template]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
...
...
software/etherpad-lite/common.cfg
View file @
bc95011e
...
@@ -39,7 +39,7 @@ module = etherpad-lite
...
@@ -39,7 +39,7 @@ module = etherpad-lite
[instance-recipe-egg]
[instance-recipe-egg]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python =
python2.7
python =
${buildout:python}
eggs = ${instance-recipe:egg}
eggs = ${instance-recipe:egg}
[etherpad-lite-repository]
[etherpad-lite-repository]
...
@@ -95,6 +95,3 @@ output = ${etherpad-lite-repository:location}/bin/installDeps.sh
...
@@ -95,6 +95,3 @@ output = ${etherpad-lite-repository:location}/bin/installDeps.sh
recipe = plone.recipe.command
recipe = plone.recipe.command
command = ${template-deps-script:output}
command = ${template-deps-script:output}
update-command = command
update-command = command
[lxml-python]
python = python2.7
software/neoppod/software.cfg
View file @
bc95011e
...
@@ -32,11 +32,6 @@ eggs =
...
@@ -32,11 +32,6 @@ eggs =
${lxml-python:egg}
${lxml-python:egg}
#END LXML
#END LXML
#LXML
[lxml-python]
python = python2.7
#END LXML
[base-template]
[base-template]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/${:filename}.in
template = ${:_profile_base_location_}/${:filename}.in
...
...
software/seleniumrunner/software.cfg
View file @
bc95011e
...
@@ -23,29 +23,18 @@ parts =
...
@@ -23,29 +23,18 @@ parts =
firefox
firefox
xwd
xwd
unzip = true
[lxml-python]
python = python2.7
[python-cffi]
python = python2.7
[python-cryptography]
python = python2.7
[instance-recipe]
[instance-recipe]
egg = slapos.cookbook
egg = slapos.cookbook
module = seleniumrunner
module = seleniumrunner
[instance-recipe-egg]
[instance-recipe-egg]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python =
python2.7
python =
${buildout:python}
eggs = ${instance-recipe:egg}
eggs = ${instance-recipe:egg}
[eggs]
[eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python =
python2.7
python =
${buildout:python}
eggs =
eggs =
${lxml-python:egg}
${lxml-python:egg}
...
...
software/silverstripe/software.cfg
View file @
bc95011e
...
@@ -31,7 +31,7 @@ mode = 0644
...
@@ -31,7 +31,7 @@ mode = 0644
[instance-recipe-egg]
[instance-recipe-egg]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python =
python2.7
python =
${buildout:python}
eggs =
eggs =
${mysql-python:egg}
${mysql-python:egg}
${instance-recipe:egg}
${instance-recipe:egg}
...
...
software/trac-svn/software.cfg
View file @
bc95011e
...
@@ -48,12 +48,9 @@ allow-hosts +=
...
@@ -48,12 +48,9 @@ allow-hosts +=
*.edgewall.org
*.edgewall.org
*.edgewall.com
*.edgewall.com
[lxml-python]
python = python2.7
[instance-egg]
[instance-egg]
recipe = z3c.recipe.scripts
recipe = z3c.recipe.scripts
python =
python2.7
python =
${buildout:python}
eggs =
eggs =
${mysql-python:egg}
${mysql-python:egg}
slapos.toolbox
slapos.toolbox
...
...
software/varnish/software.cfg
View file @
bc95011e
...
@@ -92,7 +92,7 @@ mode = 640
...
@@ -92,7 +92,7 @@ mode = 640
[eggs]
[eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python =
python2.7
python =
${buildout:python}
eggs =
eggs =
${lxml-python:egg}
${lxml-python:egg}
erp5.util
erp5.util
...
@@ -102,12 +102,9 @@ eggs =
...
@@ -102,12 +102,9 @@ eggs =
scripts =
scripts =
web_checker_utility = erp5.util.webchecker:web_checker_utility
web_checker_utility = erp5.util.webchecker:web_checker_utility
[lxml-python]
python = python2.7
[slapos-toolbox]
[slapos-toolbox]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python = ${
eggs
:python}
python = ${
buildout
:python}
eggs =
eggs =
${lxml-python:egg}
${lxml-python:egg}
slapos.toolbox
slapos.toolbox
...
...
stack/erp5/buildout.cfg
View file @
bc95011e
...
@@ -360,7 +360,7 @@ update-command = ${:command}
...
@@ -360,7 +360,7 @@ update-command = ${:command}
# XXX: Workaround for fact ERP5Type is not an distribution and does not
# XXX: Workaround for fact ERP5Type is not an distribution and does not
# expose entry point for test runner
# expose entry point for test runner
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python =
python2.7
python =
${buildout:python}
eggs = ${eggs:eggs}
eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths}
extra-paths = ${eggs:extra-paths}
entry-points =
entry-points =
...
@@ -398,7 +398,7 @@ initialization =
...
@@ -398,7 +398,7 @@ initialization =
# XXX: Workaround for fact ERP5Type is not an distribution and does not
# XXX: Workaround for fact ERP5Type is not an distribution and does not
# expose entry point for test runner
# expose entry point for test runner
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python =
python2.7
python =
${buildout:python}
eggs = ${eggs:eggs}
eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths}
extra-paths = ${eggs:extra-paths}
entry-points =
entry-points =
...
@@ -417,6 +417,7 @@ initialization =
...
@@ -417,6 +417,7 @@ initialization =
[patched-eggs]
[patched-eggs]
recipe = minitage.recipe.egg
recipe = minitage.recipe.egg
python = ${buildout:python}
eggs =
eggs =
Acquisition
Acquisition
Products.DCWorkflow
Products.DCWorkflow
...
@@ -433,7 +434,7 @@ ZODB3-patch-binary = ${patch:location}/bin/patch
...
@@ -433,7 +434,7 @@ ZODB3-patch-binary = ${patch:location}/bin/patch
[eggs]
[eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python =
python2.7
python =
${buildout:python}
eggs =
eggs =
${mysql-python:egg}
${mysql-python:egg}
${lxml-python:egg}
${lxml-python:egg}
...
@@ -524,7 +525,7 @@ eggs =
...
@@ -524,7 +525,7 @@ eggs =
# parameterizing the version of the generated python interpreter name by the
# parameterizing the version of the generated python interpreter name by the
# python section version causes dependency between this egg section and the
# python section version causes dependency between this egg section and the
# installation of python, which we don't want on an instance
# installation of python, which we don't want on an instance
interpreter =
python2.7
interpreter =
${buildout:python}
scripts =
scripts =
repozo
repozo
runzope
runzope
...
@@ -538,7 +539,7 @@ extra-paths =
...
@@ -538,7 +539,7 @@ extra-paths =
[zodbanalyze]
[zodbanalyze]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python =
python2.7
python =
${buildout:python}
eggs =
eggs =
ZODB3
ZODB3
erp5.util
erp5.util
...
@@ -550,24 +551,9 @@ scripts = zodbanalyze
...
@@ -550,24 +551,9 @@ scripts = zodbanalyze
branch =
branch =
revision = b91e43a3922160fe5f080eca45e0c51fe5345bcd
revision = b91e43a3922160fe5f080eca45e0c51fe5345bcd
[mysql-python]
python = python2.7
[lxml-python]
python = python2.7
[pil-python]
python = python2.7
[python-ldap-python]
python = python2.7
[pysvn-python]
python = python2.7
[slapos-toolbox]
[slapos-toolbox]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python = ${
eggs
:python}
python = ${
buildout
:python}
eggs =
eggs =
${lxml-python:egg}
${lxml-python:egg}
slapos.toolbox
slapos.toolbox
...
...
stack/slapos.cfg
View file @
bc95011e
...
@@ -2,6 +2,8 @@
...
@@ -2,6 +2,8 @@
# Software Releases or Stacks can safely extend this stack.
# Software Releases or Stacks can safely extend this stack.
[buildout]
[buildout]
python = python2.7
# Developers need to add explicitely this part in their software profile
# Developers need to add explicitely this part in their software profile
# parts = slapos-cookbook
# parts = slapos-cookbook
...
@@ -62,6 +64,7 @@ networkcache-section = networkcache
...
@@ -62,6 +64,7 @@ networkcache-section = networkcache
# if using "develop"
# if using "develop"
[slapos-cookbook]
[slapos-cookbook]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python = ${buildout:python}
eggs =
eggs =
${lxml-python:egg}
${lxml-python:egg}
${python-cffi:egg}
${python-cffi:egg}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment