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
Tatuya Kamada
slapos
Commits
2f23e0c8
Commit
2f23e0c8
authored
Dec 28, 2011
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/erp5' into upstreamerp5generic
Conflicts: software/erp5/software.cfg
parents
b58062c8
6a41df23
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
33 additions
and
11 deletions
+33
-11
component/gdbm/buildout.cfg
component/gdbm/buildout.cfg
+2
-2
component/git/buildout.cfg
component/git/buildout.cfg
+2
-2
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg
+4
-4
component/readline/buildout.cfg
component/readline/buildout.cfg
+13
-0
slapos/recipe/erp5/template/apache.ssl-snippet.conf.in
slapos/recipe/erp5/template/apache.ssl-snippet.conf.in
+2
-0
slapos/recipe/erp5/template/apache.zope.conf.in
slapos/recipe/erp5/template/apache.zope.conf.in
+4
-0
slapos/recipe/generic_zope_zeo_client/template/zope.conf.in
slapos/recipe/generic_zope_zeo_client/template/zope.conf.in
+2
-0
software/erp5/instance-erp5-development.cfg
software/erp5/instance-erp5-development.cfg
+1
-1
software/erp5/snippet-master.cfg
software/erp5/snippet-master.cfg
+1
-1
stack/erp5.cfg
stack/erp5.cfg
+2
-1
No files found.
component/gdbm/buildout.cfg
View file @
2f23e0c8
...
@@ -4,9 +4,9 @@ parts =
...
@@ -4,9 +4,9 @@ parts =
[gdbm]
[gdbm]
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
version = 1.
9.1
version = 1.
10
url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
md5sum =
59f6e4c4193cb875964ffbe8aa384b58
md5sum =
88770493c2559dc80b561293e39d3570
configure-options =
configure-options =
--disable-static
--disable-static
# install as parts/gdbm/include/gdbm/*.h etc. because some softwares
# install as parts/gdbm/include/gdbm/*.h etc. because some softwares
...
...
component/git/buildout.cfg
View file @
2f23e0c8
...
@@ -15,8 +15,8 @@ parts =
...
@@ -15,8 +15,8 @@ parts =
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
# url = http://kernel.org/pub/software/scm/git/git-1.7.4.5.tar.bz2
# url = http://kernel.org/pub/software/scm/git/git-1.7.4.5.tar.bz2
# Circumvent kernel.org downtime
# Circumvent kernel.org downtime
url = http://
ftp.free.fr/mirrors/ftp.kernel.org/software/scm/git/git-1.7.4.5.tar.bz2
url = http://
git-core.googlecode.com/files/git-1.7.8.tar.gz
md5sum =
2fa6c4c847ed87523cf55de54af457eb
md5sum =
4a3c03a04dbb857ecc875dae1278b76e
configure-options =
configure-options =
--with-curl=${curl:location}
--with-curl=${curl:location}
--with-openssl=${openssl:location}
--with-openssl=${openssl:location}
...
...
component/mariadb/buildout.cfg
View file @
2f23e0c8
...
@@ -22,9 +22,9 @@ download-only = true
...
@@ -22,9 +22,9 @@ download-only = true
[mariadb]
[mariadb]
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
version = 5.3.
2-beta
version = 5.3.
3-rc
url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
md5sum =
d8199454059ab2c98313aaad0c1bc318
md5sum =
715c61bb101acc7d37e893f6a9de9267
# compile directory is required to build mysql plugins.
# compile directory is required to build mysql plugins.
keep-compile-dir = true
keep-compile-dir = true
# configure: how to avoid searching for my.cnf?
# configure: how to avoid searching for my.cnf?
...
@@ -56,8 +56,8 @@ patch-options = -p0
...
@@ -56,8 +56,8 @@ patch-options = -p0
patches =
patches =
${mariadb-no_test-patch:location}/${mariadb-no_test-patch:filename}
${mariadb-no_test-patch:location}/${mariadb-no_test-patch:filename}
environment =
environment =
CPPFLAGS=-I${ncurses:location}/include -I${readline:location}/include
CPPFLAGS=-I${ncurses:location}/include -I${readline
5
:location}/include
LDFLAGS=-Wl,-rpath=${libevent:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline
:location}/lib -Wl,-rpath=${readline
:location}/lib -Wl,-rpath=${zlib:location}/lib
LDFLAGS=-Wl,-rpath=${libevent:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline
5:location}/lib -Wl,-rpath=${readline5
:location}/lib -Wl,-rpath=${zlib:location}/lib
[mroonga-mariadb]
[mroonga-mariadb]
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
...
...
component/readline/buildout.cfg
View file @
2f23e0c8
[buildout]
[buildout]
parts =
parts =
readline5
readline
readline
extends =
extends =
../ncurses/buildout.cfg
../ncurses/buildout.cfg
# readline-5.x is still used for GPL2 only softwares.
[readline5]
recipe = hexagonit.recipe.cmmi
url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz
md5sum = e39331f32ad14009b9ff49cc10c5e751
configure-options =
--enable-multibyte
--disable-static
--with-ncurses=${ncurses:location}
environment =
LDFLAGS =-Wl,-rpath=${ncurses:location}/lib
[readline]
[readline]
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
url = http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz
url = http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz
...
...
slapos/recipe/erp5/template/apache.ssl-snippet.conf.in
View file @
2f23e0c8
...
@@ -3,5 +3,7 @@ SSLCertificateFile %(login_certificate)s
...
@@ -3,5 +3,7 @@ SSLCertificateFile %(login_certificate)s
SSLCertificateKeyFile %(login_key)s
SSLCertificateKeyFile %(login_key)s
SSLRandomSeed startup builtin
SSLRandomSeed startup builtin
SSLRandomSeed connect builtin
SSLRandomSeed connect builtin
SSLProtocol -ALL +SSLv3 +TLSv1
SSLCipherSuite ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM
SSLProxyEngine On
SSLProxyEngine On
slapos/recipe/erp5/template/apache.zope.conf.in
View file @
2f23e0c8
...
@@ -26,6 +26,10 @@ TypesConfig conf/mime.types
...
@@ -26,6 +26,10 @@ TypesConfig conf/mime.types
AddType application/x-compress .Z
AddType application/x-compress .Z
AddType application/x-gzip .gz .tgz
AddType application/x-gzip .gz .tgz
ServerTokens Prod
ServerSignature Off
TraceEnable Off
# As backend is trusting REMOTE_USER header unset it always
# As backend is trusting REMOTE_USER header unset it always
RequestHeader unset REMOTE_USER
RequestHeader unset REMOTE_USER
...
...
slapos/recipe/generic_zope_zeo_client/template/zope.conf.in
View file @
2f23e0c8
...
@@ -31,12 +31,14 @@ lock-filename %(lock-filename)s
...
@@ -31,12 +31,14 @@ lock-filename %(lock-filename)s
# Logging configuration
# Logging configuration
<eventlog>
<eventlog>
level info
<logfile>
<logfile>
dateformat
dateformat
path %(event_log)s
path %(event_log)s
</logfile>
</logfile>
</eventlog>
</eventlog>
<logger access>
<logger access>
level WARN
<logfile>
<logfile>
dateformat
dateformat
path %(z2_log)s
path %(z2_log)s
...
...
software/erp5/instance-erp5-development.cfg
View file @
2f23e0c8
...
@@ -77,7 +77,7 @@ cadir-path = $${erp5-certificate-authority:ca-dir}
...
@@ -77,7 +77,7 @@ cadir-path = $${erp5-certificate-authority:ca-dir}
update-wrapper = $${basedirectory:services}/erp5-update
update-wrapper = $${basedirectory:services}/erp5-update
# Defaults
# Defaults
configurator-bt5-list = erp5_
core_proxy_field_legacy erp5_full_text_myisam_catalog erp5_base erp5_workflow erp5_configurator erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung
configurator-bt5-list = erp5_
full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_ung erp5_configurator_run_my_doc
bt5-repository-list = $${zope-instance:bt5-repository-list}
bt5-repository-list = $${zope-instance:bt5-repository-list}
[request-common]
[request-common]
...
...
software/erp5/snippet-master.cfg
View file @
2f23e0c8
...
@@ -231,5 +231,5 @@ cadir-path = $${erp5-certificate-authority:ca-dir}
...
@@ -231,5 +231,5 @@ cadir-path = $${erp5-certificate-authority:ca-dir}
update-wrapper = $${basedirectory:services}/erp5-update
update-wrapper = $${basedirectory:services}/erp5-update
# Defaults
# Defaults
configurator-bt5-list = erp5_
core_proxy_field_legacy erp5_full_text_myisam_catalog erp5_base erp5_workflow erp5_configurator erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung
configurator-bt5-list = erp5_
full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_ung erp5_configurator_run_my_doc
bt5-repository-list = $${%(zope_section)s:bt5-repository-list}
bt5-repository-list = $${%(zope_section)s:bt5-repository-list}
stack/erp5.cfg
View file @
2f23e0c8
...
@@ -31,7 +31,7 @@ allow-hosts =
...
@@ -31,7 +31,7 @@ allow-hosts =
extends =
extends =
# Exact version of Zope
# Exact version of Zope
http://svn.zope.org/repos/main/Zope/tags/2.12.2
0
/versions.cfg
http://svn.zope.org/repos/main/Zope/tags/2.12.2
1
/versions.cfg
../component/logrotate/buildout.cfg
../component/logrotate/buildout.cfg
../component/dcron/buildout.cfg
../component/dcron/buildout.cfg
../component/file/buildout.cfg
../component/file/buildout.cfg
...
@@ -309,6 +309,7 @@ eggs =
...
@@ -309,6 +309,7 @@ eggs =
SOAPpy
SOAPpy
cElementTree
cElementTree
chardet
chardet
coverage
elementtree
elementtree
erp5diff
erp5diff
ipdb
ipdb
...
...
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