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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Carlos Ramos Carreño
slapos
Commits
46f0f8f1
Commit
46f0f8f1
authored
Jun 12, 2011
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'erp5' into vifib
parents
75cefd45
84bbc99c
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
50 additions
and
43 deletions
+50
-43
component/glib/buildout.cfg
component/glib/buildout.cfg
+2
-2
component/libpng/buildout.cfg
component/libpng/buildout.cfg
+2
-2
component/poppler/buildout.cfg
component/poppler/buildout.cfg
+10
-0
component/python-2.6/buildout.cfg
component/python-2.6/buildout.cfg
+4
-3
component/python-2.7/buildout.cfg
component/python-2.7/buildout.cfg
+8
-8
component/sqlite3/buildout.cfg
component/sqlite3/buildout.cfg
+2
-2
component/subversion/buildout.cfg
component/subversion/buildout.cfg
+2
-2
slapos/recipe/erp5/template/apache.zope.conf.in
slapos/recipe/erp5/template/apache.zope.conf.in
+16
-18
software/erp5/instance.cfg
software/erp5/instance.cfg
+1
-0
software/erp5/software.cfg
software/erp5/software.cfg
+1
-1
stack/erp5.cfg
stack/erp5.cfg
+2
-5
No files found.
component/glib/buildout.cfg
View file @
46f0f8f1
...
@@ -5,8 +5,8 @@ extends =
...
@@ -5,8 +5,8 @@ extends =
[glib]
[glib]
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.
6
.tar.bz2
url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.
7
.tar.bz2
md5sum =
7d8fc15ae70d5111c0cf2a79d50ef717
md5sum =
feda1650c8646ad39c7b01d95b03766b
configure-options =
configure-options =
--disable-static
--disable-static
--disable-selinux
--disable-selinux
...
...
component/libpng/buildout.cfg
View file @
46f0f8f1
...
@@ -21,5 +21,5 @@ md5sum = e3ac7879d62ad166a6f0c7441390d12b
...
@@ -21,5 +21,5 @@ md5sum = e3ac7879d62ad166a6f0c7441390d12b
[libpng]
[libpng]
<= libpng-common
<= libpng-common
url = http://download.sourceforge.net/libpng/libpng-1.5.
1
.tar.bz2
url = http://download.sourceforge.net/libpng/libpng-1.5.
2
.tar.bz2
md5sum =
8fdcb7c0e78d54ff0362a800cbe3bc31
md5sum =
a003b37ed9afb0d9164eb7228421057c
component/poppler/buildout.cfg
0 → 100644
View file @
46f0f8f1
[buildout]
parts = xpdf
[poppler]
<= poppler-0.17.1
[poppler-0.17.1]
recipe = hexagonit.recipe.cmmi
md5sum = 8d7276d1943078c76aabe9f2ec52d50b
url = http://poppler.freedesktop.org/poppler-0.17.1.tar.gz
component/python-2.6/buildout.cfg
View file @
46f0f8f1
[buildout]
[buildout]
# XXX: Extends shall not jump out of software
# XXX: Extends shall not jump out of software
extends =
extends =
...
@@ -27,12 +28,12 @@ recipe = hexagonit.recipe.cmmi
...
@@ -27,12 +28,12 @@ recipe = hexagonit.recipe.cmmi
# other settings in this part if we don't set it explicitly here.
# other settings in this part if we don't set it explicitly here.
prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
version = 2.6
version = 2.6
package_version = ${:version}.
6
package_version = ${:version}.
7
executable = ${:prefix}/bin/python${:version}
executable = ${:prefix}/bin/python${:version}
url =
url =
http://python.org/ftp/python/${:package_version}/Python-${:package_version}.t
gz
http://python.org/ftp/python/${:package_version}/Python-${:package_version}.t
ar.bz2
md5sum =
b2f209df270a33315e62c1ffac1937f0
md5sum =
d40ef58ed88438a870bbeb0ac5d4217b
patch-options = -p1
patch-options = -p1
patches =
patches =
${python-2.6.6-no_system_inc_dirs.patch:location}/${python-2.6.6-no_system_inc_dirs.patch:filename}
${python-2.6.6-no_system_inc_dirs.patch:location}/${python-2.6.6-no_system_inc_dirs.patch:filename}
...
...
component/python-2.7/buildout.cfg
View file @
46f0f8f1
...
@@ -13,18 +13,18 @@ parts =
...
@@ -13,18 +13,18 @@ parts =
python2.7
python2.7
[python2.7]
[python2.7]
<= python2.7.
1
<= python2.7.
2
[python2.7.
0
]
[python2.7.
1
]
<= python2.7common
<= python2.7common
package_version = 2.7
package_version = 2.7
.1
md5sum =
35f56b092ecf39a6bd59d64f142aae0
f
md5sum =
aa27bc25725137ba155910bd8e5ddc4
f
package_version_suffix =
package_version_suffix =
[python2.7.
1
]
[python2.7.
2
]
<= python2.7common
<= python2.7common
package_version = 2.7.
1
package_version = 2.7.
2
md5sum =
15ed56733655e3fab785e49a7278d2fb
md5sum =
ba7b2f11ffdbf195ee0d111b9455a5bd
package_version_suffix =
package_version_suffix =
[bootstrap2.7]
[bootstrap2.7]
...
@@ -45,7 +45,7 @@ version = 2.7
...
@@ -45,7 +45,7 @@ version = 2.7
executable = ${:prefix}/bin/python${:version}
executable = ${:prefix}/bin/python${:version}
url =
url =
http://python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.t
gz
http://python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.t
ar.bz2
configure-options =
configure-options =
--enable-unicode=ucs4
--enable-unicode=ucs4
--with-threads
--with-threads
...
...
component/sqlite3/buildout.cfg
View file @
46f0f8f1
...
@@ -5,8 +5,8 @@ parts =
...
@@ -5,8 +5,8 @@ parts =
[sqlite3]
[sqlite3]
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
url = http://www.sqlite.org/sqlite-autoconf-307060
2
.tar.gz
url = http://www.sqlite.org/sqlite-autoconf-307060
3
.tar.gz
md5sum =
f16c08617968b4087b3d591fd575f59f
md5sum =
7eb41eea5ffa5cbe359a48629084c425
configure-options =
configure-options =
--disable-static
--disable-static
--enable-readline
--enable-readline
...
...
component/subversion/buildout.cfg
View file @
46f0f8f1
...
@@ -24,8 +24,8 @@ md5sum = 8d911ec2422dc4c08a00693ac915a07a
...
@@ -24,8 +24,8 @@ md5sum = 8d911ec2422dc4c08a00693ac915a07a
[subversion]
[subversion]
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
url = http://subversion.tigris.org/downloads/subversion-1.6.1
6
.tar.bz2
url = http://subversion.tigris.org/downloads/subversion-1.6.1
7
.tar.bz2
md5sum =
32f25a6724559fe8691d1f57a63f636e
md5sum =
81e5dc5beee4b3fc025ac70c0b6caa14
patches =
patches =
${subversion-1.6.0-disable_linking_against_unneeded_libraries:location}/${subversion-1.6.0-disable_linking_against_unneeded_libraries:filename}
${subversion-1.6.0-disable_linking_against_unneeded_libraries:location}/${subversion-1.6.0-disable_linking_against_unneeded_libraries:filename}
configure-options =
configure-options =
...
...
slapos/recipe/erp5/template/apache.zope.conf.in
View file @
46f0f8f1
# Apache configuration file for Zope
# Apache configuration file for Zope
# Automatically generated
# Automatically generated
# List of modules
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule setenvif_module modules/mod_setenvif.so
LoadModule version_module modules/mod_version.so
LoadModule proxy_module modules/mod_proxy.so
LoadModule proxy_http_module modules/mod_proxy_http.so
LoadModule ssl_module modules/mod_ssl.so
LoadModule mime_module modules/mod_mime.so
LoadModule dav_module modules/mod_dav.so
LoadModule dav_fs_module modules/mod_dav_fs.so
LoadModule negotiation_module modules/mod_negotiation.so
LoadModule rewrite_module modules/mod_rewrite.so
LoadModule headers_module modules/mod_headers.so
LoadModule antiloris_module modules/mod_antiloris.so
# Basic server configuration
# Basic server configuration
PidFile "%(pid_file)s"
PidFile "%(pid_file)s"
LockFile "%(lock_file)s"
LockFile "%(lock_file)s"
Listen %(ip)s:%(port)s
Listen %(ip)s:%(port)s
ServerAdmin %(server_admin)s
ServerAdmin %(server_admin)s
DefaultType text/plain
TypesConfig conf/mime.types
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
...
@@ -19,7 +34,6 @@ RequestHeader unset REMOTE_USER
...
@@ -19,7 +34,6 @@ RequestHeader unset REMOTE_USER
# Log configuration
# Log configuration
ErrorLog "%(error_log)s"
ErrorLog "%(error_log)s"
LogLevel warn
LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
CustomLog "%(access_log)s" common
CustomLog "%(access_log)s" common
...
@@ -37,19 +51,3 @@ CustomLog "%(access_log)s" common
...
@@ -37,19 +51,3 @@ CustomLog "%(access_log)s" common
# Magic of Zope related rewrite
# Magic of Zope related rewrite
RewriteEngine On
RewriteEngine On
%(rewrite_rule)s
%(rewrite_rule)s
# List of modules
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule setenvif_module modules/mod_setenvif.so
LoadModule version_module modules/mod_version.so
LoadModule proxy_module modules/mod_proxy.so
LoadModule proxy_http_module modules/mod_proxy_http.so
LoadModule ssl_module modules/mod_ssl.so
LoadModule mime_module modules/mod_mime.so
LoadModule dav_module modules/mod_dav.so
LoadModule dav_fs_module modules/mod_dav_fs.so
LoadModule negotiation_module modules/mod_negotiation.so
LoadModule rewrite_module modules/mod_rewrite.so
LoadModule headers_module modules/mod_headers.so
LoadModule antiloris_module modules/mod_antiloris.so
software/erp5/instance.cfg
View file @
46f0f8f1
...
@@ -49,6 +49,7 @@ link_binary_list =
...
@@ -49,6 +49,7 @@ link_binary_list =
${graphviz:location}/bin/dot
${graphviz:location}/bin/dot
${grep:location}/bin/grep
${grep:location}/bin/grep
${imagemagick:location}/bin/convert
${imagemagick:location}/bin/convert
${imagemagick:location}/bin/identify
${mariadb:location}/bin/mysql
${mariadb:location}/bin/mysql
${mariadb:location}/bin/mysqldump
${mariadb:location}/bin/mysqldump
${pdftk:location}/bin/pdftk
${pdftk:location}/bin/pdftk
...
...
software/erp5/software.cfg
View file @
46f0f8f1
...
@@ -23,6 +23,6 @@ module = erp5
...
@@ -23,6 +23,6 @@ module = erp5
# Default template for erp5 instance.
# Default template for erp5 instance.
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
md5sum =
f558c33d068debfc121e3970cfb5780e
md5sum =
9bc4cb9221bb5cc973b3ff7c4720a21b
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
stack/erp5.cfg
View file @
46f0f8f1
...
@@ -43,6 +43,7 @@ extends =
...
@@ -43,6 +43,7 @@ extends =
../component/w3m/buildout.cfg
../component/w3m/buildout.cfg
../component/xorg/buildout.cfg
../component/xorg/buildout.cfg
../component/xpdf/buildout.cfg
../component/xpdf/buildout.cfg
../component/poppler/buildout.cfg
../component/xtrabackup/buildout.cfg
../component/xtrabackup/buildout.cfg
../component/zabbix/buildout.cfg
../component/zabbix/buildout.cfg
../component/sed/buildout.cfg
../component/sed/buildout.cfg
...
@@ -104,11 +105,6 @@ parts =
...
@@ -104,11 +105,6 @@ parts =
# get git repositories
# get git repositories
erp5
erp5
[products]
# XXX: ERP5 related products are not defined as python distributions, so it is
# required to configure them in declarative manner
list = ${products-deps:location} ${erp5:location}/product
[bootstrap2.6]
[bootstrap2.6]
python = python2.6
python = python2.6
...
@@ -277,6 +273,7 @@ eggs =
...
@@ -277,6 +273,7 @@ eggs =
xupdate_processor
xupdate_processor
feedparser
feedparser
argparse
argparse
validictory
# Zope 2.12 with patched acquisition
# Zope 2.12 with patched acquisition
ZODB3
ZODB3
...
...
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