Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Cédric Le Ninivin
slapos
Commits
be492279
Commit
be492279
authored
Jul 19, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'erp5'
parents
c08bbd93
dddb7942
Changes
12
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
515 additions
and
43 deletions
+515
-43
component/gcc/buildout.cfg
component/gcc/buildout.cfg
+22
-7
component/git/buildout.cfg
component/git/buildout.cfg
+1
-0
component/python-2.7/buildout.cfg
component/python-2.7/buildout.cfg
+3
-0
slapos/recipe/README.generic_varnish.txt
slapos/recipe/README.generic_varnish.txt
+2
-3
slapos/recipe/generic_varnish/__init__.py
slapos/recipe/generic_varnish/__init__.py
+5
-1
slapos/recipe/generic_varnish/template/varnishd.in
slapos/recipe/generic_varnish/template/varnishd.in
+1
-1
slapos/recipe/generic_zope/template/zope.conf.in
slapos/recipe/generic_zope/template/zope.conf.in
+3
-0
slapos/recipe/generic_zope_zeo_client/template/zope.conf.in
slapos/recipe/generic_zope_zeo_client/template/zope.conf.in
+3
-0
software/varnish/instance-varnish.cfg.in
software/varnish/instance-varnish.cfg.in
+138
-0
software/varnish/instance.cfg.in
software/varnish/instance.cfg.in
+56
-0
software/varnish/software.cfg
software/varnish/software.cfg
+250
-0
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+31
-31
No files found.
component/gcc/buildout.cfg
View file @
be492279
...
@@ -33,7 +33,7 @@ environment =
...
@@ -33,7 +33,7 @@ environment =
[ppl]
[ppl]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
# we should use version 0.10.x for gcc-4.5
# we should use version 0.10.x for gcc-4.5
url = http://
www.cs.unipr.it/ppl/D
ownload/ftp/releases/0.10.2/ppl-0.10.2.tar.bz2
url = http://
bugseng.com/products/ppl/d
ownload/ftp/releases/0.10.2/ppl-0.10.2.tar.bz2
md5sum = 5667111f53150618b0fa522ffc53fc3e
md5sum = 5667111f53150618b0fa522ffc53fc3e
configure-options =
configure-options =
--with-libgmp-prefix=${gmp:location}
--with-libgmp-prefix=${gmp:location}
...
@@ -85,9 +85,6 @@ patches =
...
@@ -85,9 +85,6 @@ patches =
${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
patch-options = -p2
patch-options = -p2
configure-command = make clean \\; make distclean \\; ./configure
configure-command = make clean \\; make distclean \\; ./configure
# GMP does not correctly detect achitecture so it have to be given
# as slapos.recipe.cmmi is using shell expansion in subproceses
# backticks are working
configure-options =
configure-options =
--disable-bootstrap
--disable-bootstrap
--enable-languages="c,c++"
--enable-languages="c,c++"
...
@@ -97,12 +94,30 @@ configure-options =
...
@@ -97,12 +94,30 @@ configure-options =
--with-mpc=${mpc:location}
--with-mpc=${mpc:location}
--with-ppl=${ppl:location}
--with-ppl=${ppl:location}
--with-cloog=${cloog-ppl:location}
--with-cloog=${cloog-ppl:location}
--with-ecj-jar=${ecj:location}/${ecj:filename}
--prefix=${buildout:parts-directory}/${:_buildout_section_name_}
--prefix=${buildout:parts-directory}/${:_buildout_section_name_}
environment =
environment =
LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${ppl:location}/lib -Wl,-rpath=${cloog-ppl:location}/lib
LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${ppl:location}/lib -Wl,-rpath=${cloog-ppl:location}/lib
PATH=${zip:location}/bin:%(PATH)s
# make install does not work when several core are used
make-targets = install -j1
[gcc-minimal]
recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-core-4.5.4.tar.bz2
md5sum = ca62e442629a9a7710f5d797bf1b521c
patches =
${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
patch-options = -p2
configure-options =
--disable-bootstrap
--enable-languages=c
--disable-multilib
--with-gmp=${gmp:location}
--with-mpfr=${mpfr:location}
--with-mpc=${mpc:location}
--without-ppl
--without-cloog
environment =
LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib
# make install does not work when several core are used
# make install does not work when several core are used
make-targets = install -j1
make-targets = install -j1
...
...
component/git/buildout.cfg
View file @
be492279
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
[buildout]
[buildout]
extends =
extends =
../curl/buildout.cfg
../curl/buildout.cfg
../gettext/buildout.cfg
../libexpat/buildout.cfg
../libexpat/buildout.cfg
../openssl/buildout.cfg
../openssl/buildout.cfg
../zlib/buildout.cfg
../zlib/buildout.cfg
...
...
component/python-2.7/buildout.cfg
View file @
be492279
...
@@ -44,6 +44,9 @@ configure-options =
...
@@ -44,6 +44,9 @@ configure-options =
--enable-unicode=ucs4
--enable-unicode=ucs4
--with-system-expat
--with-system-expat
--with-threads
--with-threads
# Profiled build:
make-binary =
make-targets = make profile-opt && make install
# the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
# the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
# which would otherwise load the system libmagic.so with ctypes
# which would otherwise load the system libmagic.so with ctypes
...
...
slapos/recipe/README.generic_varnish.txt
View file @
be492279
...
@@ -12,15 +12,14 @@ On slap console, you can instanciate varnish like this:
...
@@ -12,15 +12,14 @@ On slap console, you can instanciate varnish like this:
instance = request(
instance = request(
software_type='varnish',
software_type='varnish',
partition_parameter_kw={
partition_parameter_kw={
'
tidstorage-url':'http://[your tidstrage address]:your tid strage
port',
'
backend-url':'https://[your_backend_address]:your_backend_
port',
'web-checker-frontend-url':'http://www.example.com',
'web-checker-frontend-url':'http://www.example.com',
'web-checker-mail-address':'web-checker-result@example.com',
'web-checker-mail-address':'web-checker-result@example.com',
'web-checker-smtp-host':'mail.example.com',
'web-checker-smtp-host':'mail.example.com',
}
}
)
)
tidstrage-url is the backend url that varnish will cache. It is expected that
backend-url is the backend url that varnish will cache.
the backend is created by tidstorage recipe.
web-checker-frontend-url is the entry-point-url that web checker will check
web-checker-frontend-url is the entry-point-url that web checker will check
the HTTP headers of all the pages in the web site.
the HTTP headers of all the pages in the web site.
...
...
slapos/recipe/generic_varnish/__init__.py
View file @
be492279
...
@@ -37,7 +37,10 @@ class Recipe(GenericSlapRecipe):
...
@@ -37,7 +37,10 @@ class Recipe(GenericSlapRecipe):
"""
"""
def
_install
(
self
):
def
_install
(
self
):
ip
=
self
.
options
[
'ip'
]
ip
=
self
.
options
[
'ip'
]
backend_url
=
self
.
parameter_dict
[
'tidstorage-url'
]
backend_url
=
self
.
parameter_dict
.
get
(
'backend-url'
,
self
.
parameter_dict
.
get
(
'tidstorage-url'
)
# BBB
)
backend_server
,
backend_port
=
self
.
_getBackendServer
(
backend_url
)
backend_server
,
backend_port
=
self
.
_getBackendServer
(
backend_url
)
path_list
=
[]
path_list
=
[]
if
backend_url
.
startswith
(
'https://'
):
if
backend_url
.
startswith
(
'https://'
):
...
@@ -70,6 +73,7 @@ class Recipe(GenericSlapRecipe):
...
@@ -70,6 +73,7 @@ class Recipe(GenericSlapRecipe):
varnishd_pid_file
=
self
.
options
[
'pid-file'
],
varnishd_pid_file
=
self
.
options
[
'pid-file'
],
varnish_instance_name
=
self
.
options
[
'varnish-instance-name'
],
varnish_instance_name
=
self
.
options
[
'varnish-instance-name'
],
varnish_data
=
self
.
options
[
'varnish-data'
],
varnish_data
=
self
.
options
[
'varnish-data'
],
gcc_location
=
self
.
options
[
'gcc-location'
],
shell_path
=
self
.
options
[
'shell-path'
],
shell_path
=
self
.
options
[
'shell-path'
],
vcl_file
=
self
.
options
[
'vcl-file'
],
vcl_file
=
self
.
options
[
'vcl-file'
],
backend_port
=
backend_port
,
backend_port
=
backend_port
,
...
...
slapos/recipe/generic_varnish/template/varnishd.in
View file @
be492279
...
@@ -10,5 +10,5 @@ DAEMON_OPTS="-F \
...
@@ -10,5 +10,5 @@ DAEMON_OPTS="-F \
PIDFILE=%(varnishd_pid_file)s
PIDFILE=%(varnishd_pid_file)s
# exporting PATH here so that we will pass the PATH variable to the subprocess
# exporting PATH here so that we will pass the PATH variable to the subprocess
export PATH
export PATH
="%(gcc_location)s:$PATH"
exec %(varnishd_binary)s -P ${PIDFILE} ${DAEMON_OPTS} 2>&1
exec %(varnishd_binary)s -P ${PIDFILE} ${DAEMON_OPTS} 2>&1
slapos/recipe/generic_zope/template/zope.conf.in
View file @
be492279
...
@@ -25,6 +25,9 @@ rest-input-encoding utf-8
...
@@ -25,6 +25,9 @@ rest-input-encoding utf-8
rest-output-encoding utf-8
rest-output-encoding utf-8
default-zpublisher-encoding utf-8
default-zpublisher-encoding utf-8
# Disable ownership checking to execute codes generated by alarm
skip-ownership-checking on
# Temporary storage database (for sessions)
# Temporary storage database (for sessions)
<zodb_db temporary>
<zodb_db temporary>
<temporarystorage>
<temporarystorage>
...
...
slapos/recipe/generic_zope_zeo_client/template/zope.conf.in
View file @
be492279
...
@@ -25,6 +25,9 @@ rest-input-encoding utf-8
...
@@ -25,6 +25,9 @@ rest-input-encoding utf-8
rest-output-encoding utf-8
rest-output-encoding utf-8
default-zpublisher-encoding utf-8
default-zpublisher-encoding utf-8
# Disable ownership checking to execute codes generated by alarm
skip-ownership-checking on
# Temporary storage database (for sessions)
# Temporary storage database (for sessions)
<zodb_db temporary>
<zodb_db temporary>
<temporarystorage>
<temporarystorage>
...
...
software/varnish/instance-varnish.cfg.in
0 → 100644
View file @
be492279
{% set web_checker_parameter = slapparameter_dict['web-checker-mail-address'] -%}
[buildout]
parts =
publish-varnish-connection-information
varnish-instance
cron
cron-entry-logrotate
{# When web_checker related parameter is given, web_checker will be enabled.#}
{% if web_checker_parameter is defined %}
web-checker
cron-entry-web-checker
logrotate-entry-web-checker
{% endif %}
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
[publish-varnish-connection-information]
recipe = slapos.cookbook:publishurl
url = http://${varnish-instance:ip}:${varnish-instance:server-port}/
[varnish-instance]
recipe = slapos.cookbook:generic.varnish
# Network options
ip = ${slap-network-information:local-ipv4}
server-port = 6001
manager-port = 6002
stunnel-port = 6003
# Paths: Running wrappers
varnishd-wrapper = ${basedirectory:services}/varnishd
varnishlog-wrapper = ${rootdirectory:bin}/varnishlog
stunnel-wrapper = ${basedirectory:services}/stunnel
# Binary information
varnishd-binary = {{ parameter_dict['varnish'] }}/sbin/varnishd
varnishlog-binary = {{ parameter_dict['varnish'] }}/bin/varnishlog
shell-path = {{ parameter_dict['dash'] }}/bin/dash
stunnel-binary = {{ parameter_dict['stunnel'] }}/bin/stunnel
gcc-location = {{ parameter_dict['gcc'] }}/bin
# Configuration by VCL
vcl-file = ${rootdirectory:etc}/default.vcl
pid-file = ${basedirectory:run}/varnishd.pid
stunnel-conf-file = ${rootdirectory:etc}/stunnel.conf
stunnel-pid-file = ${basedirectory:run}/stunnel.pid
varnish-data = ${directory:varnish-data}
# this will pass at -n option
varnish-instance-name = ${directory:varnish-instance}
web-checker = {{ parameter_dict['buildout-bin-directory'] }}/web_checker_utility
[cron-entry-web-checker]
<= cron
recipe = slapos.cookbook:cron.d
name = web-checker
frequency = 0 0 * * *
command = ${varnish-instance:web-checker} ${web-checker:web-checker-config}
[web-checker]
recipe = slapos.cookbook:webchecker
web-checker-config = ${rootdirectory:etc}/web_checker.cfg
web-checker-working-directory = ${directory:web-checker}
frontend-url = ${varnish-instance:ip}:${varnish-instance:server-port}
wget-binary-path = {{ parameter_dict['wget'] }}/bin/wget
varnishlog-binary-path = ${varnish-instance:varnishlog-wrapper}
web-checker-log = ${basedirectory:log}/web-checker.log
[cron]
recipe = slapos.cookbook:cron
dcrond-binary = {{ parameter_dict['dcron'] }}/sbin/crond
cron-entries = ${directory:cron-entries}
crontabs = ${directory:crontabs}
cronstamps = ${directory:cronstamps}
binary = ${basedirectory:services}/crond
catcher = ${cron-simplelogger:wrapper}
[cron-simplelogger]
recipe = slapos.cookbook:simplelogger
wrapper = ${rootdirectory:bin}/cron_simplelogger
log = ${basedirectory:log}/cron.log
[cron-entry-logrotate]
<= cron
recipe = slapos.cookbook:cron.d
name = logrotate
frequency = 0 0 * * *
command = ${logrotate:wrapper}
[logrotate]
recipe = slapos.cookbook:logrotate
# Binaries
logrotate-binary = {{ parameter_dict['logrotate'] }}/usr/sbin/logrotate
gzip-binary = {{ parameter_dict['gzip'] }}/bin/gzip
gunzip-binary = {{ parameter_dict['gzip'] }}/bin/gunzip
# Directories
wrapper = ${rootdirectory:bin}/logrotate
conf = ${rootdirectory:etc}/logrotate.conf
logrotate-entries = ${directory:logrotate-entries}
backup = ${directory:logrotate-backup}
state-file = ${rootdirectory:srv}/logrotate.status
[logrotate-entry-web-checker]
<= logrotate
recipe = slapos.cookbook:logrotate.d
name = web-checker
log = ${web-checker:web-checker-log}
frequency = daily
rotate-num = 30
sharedscripts = true
notifempty = true
create = true
[basedirectory]
recipe = slapos.cookbook:mkdirectory
services = ${rootdirectory:etc}/run
run = ${rootdirectory:var}/run
backup = ${rootdirectory:srv}/backup
log = ${rootdirectory:var}/log
backup = ${rootdirectory:srv}/backup
[directory]
recipe = slapos.cookbook:mkdirectory
varnish-data = ${rootdirectory:srv}/varnish
varnish-instance = ${directory:varnish-data}/instance
cron-entries = ${rootdirectory:etc}/cron.d
crontabs = ${rootdirectory:etc}/crontabs
cronstamps = ${rootdirectory:etc}/cronstamps
logrotate-backup = ${basedirectory:backup}/logrotate
logrotate-entries = ${rootdirectory:etc}/logrotate.d
web-checker = ${rootdirectory:srv}/web-checker
[rootdirectory]
recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc
var = ${buildout:directory}/var
srv = ${buildout:directory}/srv
bin = ${buildout:directory}/bin
software/varnish/instance.cfg.in
0 → 100644
View file @
be492279
[buildout]
parts =
switch-softwaretype
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
[slap-parameters]
recipe = slapos.cookbook:slapconfiguration
computer = ${slap-connection:computer-id}
partition = ${slap-connection:partition-id}
url = ${slap-connection:server-url}
key = ${slap-connection:key-file}
cert = ${slap-connection:cert-file}
[jinja2-template-base]
recipe = slapos.recipe.template:jinja2
rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
extra-context =
context =
key eggs_directory buildout:eggs-directory
key develop_eggs_directory buildout:develop-eggs-directory
key slapparameter_dict slap-parameters:configuration
${:extra-context}
[dynamic-template-varnish-parameters]
dash = {{ dash_location }}
dcron = {{ dcron_location }}
gcc = {{ gcc_location }}
gzip = {{ gzip_location }}
logrotate = {{ logrotate_location }}
stunnel = {{ stunnel_location }}
varnish = {{ varnish_location }}
wget = {{ wget_location }}
buildout-bin-directory = {{ buildout_bin_directory }}
[dynamic-template-varnish]
< = jinja2-template-base
template = {{ template_varnish }}
filename = instance-varnish.cfg
extra-context =
section parameter_dict dynamic-template-varnish-parameters
[switch-softwaretype]
recipe = slapos.cookbook:softwaretype
default = ${dynamic-template-varnish:rendered}
[slap-connection]
# part to migrate to new - separated words
computer-id = ${slap_connection:computer_id}
partition-id = ${slap_connection:partition_id}
server-url = ${slap_connection:server_url}
software-release-url = ${slap_connection:software_release_url}
key-file = ${slap_connection:key_file}
cert-file = ${slap_connection:cert_file}
software/varnish/software.cfg
0 → 100644
View file @
be492279
This diff is collapsed.
Click to expand it.
stack/erp5/buildout.cfg
View file @
be492279
...
@@ -19,7 +19,7 @@ allow-hosts += pybrary.net
...
@@ -19,7 +19,7 @@ allow-hosts += pybrary.net
extends =
extends =
# Exact version of Zope
# Exact version of Zope
http
://svn.zope.org/repos/main/Zope/tags/2.12.26
/versions.cfg
http
s://raw.github.com/zopefoundation/Zope/2.13.21
/versions.cfg
../../stack/slapos.cfg
../../stack/slapos.cfg
../../component/logrotate/buildout.cfg
../../component/logrotate/buildout.cfg
../../component/dcron/buildout.cfg
../../component/dcron/buildout.cfg
...
@@ -44,7 +44,6 @@ extends =
...
@@ -44,7 +44,6 @@ extends =
../../component/pil-python/buildout.cfg
../../component/pil-python/buildout.cfg
../../component/pycrypto-python/buildout.cfg
../../component/pycrypto-python/buildout.cfg
../../component/pysvn-python/buildout.cfg
../../component/pysvn-python/buildout.cfg
../../component/python-2.6/buildout.cfg
../../component/python-2.7/buildout.cfg
../../component/python-2.7/buildout.cfg
../../component/python-ldap-python/buildout.cfg
../../component/python-ldap-python/buildout.cfg
../../component/rdiff-backup/buildout.cfg
../../component/rdiff-backup/buildout.cfg
...
@@ -93,7 +92,6 @@ parts =
...
@@ -93,7 +92,6 @@ parts =
w3-validator
w3-validator
tesseract
tesseract
hookbox
hookbox
bootstrap2.6
perl-DBD-mariadb
perl-DBD-mariadb
perl-DBI
perl-DBI
percona-toolkit
percona-toolkit
...
@@ -136,8 +134,6 @@ parts =
...
@@ -136,8 +134,6 @@ parts =
# Local development
# Local development
slapos.cookbook-repository
slapos.cookbook-repository
check-recipe
check-recipe
slapos.cookbook-python2.6
slapos.recipe.template-python2.6
# Create instance template
# Create instance template
template
template
...
@@ -154,19 +150,6 @@ stop-on-error = true
...
@@ -154,19 +150,6 @@ stop-on-error = true
update-command = ${:command}
update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
[slapos.cookbook-python2.6]
recipe = zc.recipe.egg
eggs = slapos.cookbook
scripts =
python = python2.6
ugly-depend-on = ${slapos.cookbook-repository:repository} ${slapos.cookbook-repository:branch}
[slapos.recipe.template-python2.6]
recipe = zc.recipe.egg
eggs = slapos.recipe.template
scripts =
python = python2.6
[template-jinja2-base]
[template-jinja2-base]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/${:filename}.in
template = ${:_profile_base_location_}/${:filename}.in
...
@@ -343,9 +326,6 @@ command =
...
@@ -343,9 +326,6 @@ command =
${buildout:executable} ${:genbt5list} ${local-bt5-repository:list}
${buildout:executable} ${:genbt5list} ${local-bt5-repository:list}
update-command = ${:command}
update-command = ${:command}
[bootstrap2.6]
python = python2.6
[erp5_repository_list]
[erp5_repository_list]
repository_id_list = erp5
repository_id_list = erp5
...
@@ -367,7 +347,7 @@ update-command = ${:command}
...
@@ -367,7 +347,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.
6
python = python2.
7
eggs = ${eggs:eggs}
eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths}
extra-paths = ${eggs:extra-paths}
entry-points =
entry-points =
...
@@ -405,7 +385,7 @@ initialization =
...
@@ -405,7 +385,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.
6
python = python2.
7
eggs = ${eggs:eggs}
eggs = ${eggs:eggs}
extra-paths = ${eggs:extra-paths}
extra-paths = ${eggs:extra-paths}
entry-points =
entry-points =
...
@@ -424,7 +404,7 @@ initialization =
...
@@ -424,7 +404,7 @@ initialization =
[eggs]
[eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python = python2.
6
python = python2.
7
eggs =
eggs =
${mysql-python:egg}
${mysql-python:egg}
${lxml-python:egg}
${lxml-python:egg}
...
@@ -432,6 +412,7 @@ eggs =
...
@@ -432,6 +412,7 @@ eggs =
${python-ldap-python:egg}
${python-ldap-python:egg}
${pysvn-python:egg}
${pysvn-python:egg}
${pycrypto-python:egg}
${pycrypto-python:egg}
lock_file
PyXML
PyXML
SOAPpy
SOAPpy
cElementTree
cElementTree
...
@@ -494,6 +475,10 @@ eggs =
...
@@ -494,6 +475,10 @@ eggs =
Products.TIDStorage
Products.TIDStorage
Products.LongRequestLogger
Products.LongRequestLogger
# BBB: Temporarily keep zope.app.testing awaiting we use newer version of CMF
# (for tests like testCookieCrumbler).
zope.app.testing
# Currently forked in our repository
# Currently forked in our repository
# Products.PortalTransforms
# Products.PortalTransforms
# Dependency for our fork of PortalTransforms
# Dependency for our fork of PortalTransforms
...
@@ -505,7 +490,7 @@ eggs =
...
@@ -505,7 +490,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.
6
interpreter = python2.
7
scripts =
scripts =
repozo
repozo
runzope
runzope
...
@@ -519,7 +504,7 @@ extra-paths =
...
@@ -519,7 +504,7 @@ extra-paths =
[zodbanalyze]
[zodbanalyze]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python = python2.
6
python = python2.
7
eggs =
eggs =
ZODB3
ZODB3
erp5.util
erp5.util
...
@@ -532,19 +517,19 @@ branch = master
...
@@ -532,19 +517,19 @@ branch = master
revision = 5c67568c403239bd8e25993602d03c553236fcec
revision = 5c67568c403239bd8e25993602d03c553236fcec
[mysql-python]
[mysql-python]
python = python2.
6
python = python2.
7
[lxml-python]
[lxml-python]
python = python2.
6
python = python2.
7
[pil-python]
[pil-python]
python = python2.
6
python = python2.
7
[python-ldap-python]
[python-ldap-python]
python = python2.
6
python = python2.
7
[pysvn-python]
[pysvn-python]
python = python2.
6
python = python2.
7
[slapos-toolbox]
[slapos-toolbox]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
...
@@ -608,6 +593,16 @@ Products.CMFDefault = 2.2.2
...
@@ -608,6 +593,16 @@ Products.CMFDefault = 2.2.2
Products.CMFTopic = 2.2.1
Products.CMFTopic = 2.2.1
Products.CMFUid = 2.2.1
Products.CMFUid = 2.2.1
# newer version requires zope.traversing>=4.0.0a2.
zope.app.appsetup = 3.16.0
# newer version requires zope.i18n>=4.0.0a3
zope.app.publication = 3.14.0
# BBB: Temporarily keep zope.app.testing awaiting we use newer version of CMF
# (for tests like testCookieCrumbler).
zope.app.testing = 3.8.1
# Pinned versions
# Pinned versions
Flask = 0.9
Flask = 0.9
GitPython = 0.3.2.RC1
GitPython = 0.3.2.RC1
...
@@ -625,6 +620,7 @@ Products.LongRequestLogger = 1.1.0
...
@@ -625,6 +620,7 @@ Products.LongRequestLogger = 1.1.0
Products.MimetypesRegistry = 2.0.4
Products.MimetypesRegistry = 2.0.4
Products.PluginRegistry = 1.3
Products.PluginRegistry = 1.3
Products.TIDStorage = 5.4.8
Products.TIDStorage = 5.4.8
Products.ZSQLMethods = 2.13.4
Pygments = 1.6
Pygments = 1.6
StructuredText = 2.11.1
StructuredText = 2.11.1
WSGIUtils = 0.7
WSGIUtils = 0.7
...
@@ -643,6 +639,7 @@ erp5.util = 0.4.34
...
@@ -643,6 +639,7 @@ erp5.util = 0.4.34
erp5diff = 0.8.1.5
erp5diff = 0.8.1.5
eventlet = 0.12.1
eventlet = 0.12.1
feedparser = 5.1.3
feedparser = 5.1.3
five.formlib = 1.0.4
five.localsitemanager = 2.0.5
five.localsitemanager = 2.0.5
fpconst = 0.7.2
fpconst = 0.7.2
gitdb = 0.5.4
gitdb = 0.5.4
...
@@ -686,3 +683,6 @@ uuid = 1.30
...
@@ -686,3 +683,6 @@ uuid = 1.30
validictory = 0.9.1
validictory = 0.9.1
xml-marshaller = 0.9.7
xml-marshaller = 0.9.7
xupdate-processor = 0.4
xupdate-processor = 0.4
zope.app.debug = 3.4.1
zope.app.dependable = 3.5.1
zope.app.form = 4.0.2
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