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
HongzheWang
slapos
Commits
f6946c0a
Commit
f6946c0a
authored
Apr 24, 2014
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'erp5-component' into erp5
parents
7c6784b7
51031106
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
170 additions
and
97 deletions
+170
-97
component/git/buildout.cfg
component/git/buildout.cfg
+4
-3
component/libreoffice-bin/buildout.cfg
component/libreoffice-bin/buildout.cfg
+3
-3
component/slapos/buildout.cfg
component/slapos/buildout.cfg
+15
-15
component/sqlite3/buildout.cfg
component/sqlite3/buildout.cfg
+2
-2
software/html5as/instance_html5as.cfg
software/html5as/instance_html5as.cfg
+1
-1
software/html5as/software.cfg
software/html5as/software.cfg
+80
-59
software/html5as/templates/downloader.in
software/html5as/templates/downloader.in
+1
-1
software/html5as/templates/nginx_conf.in
software/html5as/templates/nginx_conf.in
+1
-0
stack/cloudooo.cfg
stack/cloudooo.cfg
+54
-4
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+9
-8
stack/slapos.cfg
stack/slapos.cfg
+0
-1
No files found.
component/git/buildout.cfg
View file @
f6946c0a
...
...
@@ -7,14 +7,15 @@ extends =
../gettext/buildout.cfg
../libexpat/buildout.cfg
../openssl/buildout.cfg
../xz-utils/buildout.cfg
../zlib/buildout.cfg
parts =
git
[git]
recipe = slapos.recipe.cmmi
url = http
://git-core.googlecode.com/files/git-1.8.5.3.tar.g
z
md5sum =
57b966065882f83ef5879620a1e329ca
url = http
s://www.kernel.org/pub/software/scm/git/git-1.9.2.tar.x
z
md5sum =
437c32078b5b5b229f1c10f6474eae78
configure-options =
--with-curl=${curl:location}
--with-openssl=${openssl:location}
...
...
@@ -24,7 +25,7 @@ configure-options =
--without-tcltk
environment =
NO_PERL=y
PATH=${curl:location}/bin:${gettext:location}/bin:%(PATH)s
PATH=${curl:location}/bin:${gettext:location}/bin:
${xz-utils:location}/bin:
%(PATH)s
CPPFLAGS=-I${zlib:location}/include
LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib
...
...
component/libreoffice-bin/buildout.cfg
View file @
f6946c0a
...
...
@@ -12,11 +12,11 @@ find-links =
[libreoffice-bin]
recipe = slapos.recipe.build
# here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
version = 4.2.
1.1
version = 4.2.
3.3
url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/%s/LibreOffice_${:version}_Linux_%s_rpm.tar.gz
# supported architectures md5sums
md5sum_x86 =
55f1bb4384b27d12df17185d22c238d3
md5sum_x86-64 =
77140164da124c2f6e1eac3cad117542
md5sum_x86 =
2744ff6f5bd2bca773d6fec8b0558a5f
md5sum_x86-64 =
25f1315fa6a22aefde116302a4146e46
# where office code can be found?
officedir = libreoffice4.2
...
...
component/slapos/buildout.cfg
View file @
f6946c0a
...
...
@@ -125,15 +125,15 @@ pyOpenSSL = 0.13.1
Jinja2 = 2.7.2
MarkupSafe = 0.19
Werkzeug = 0.9.4
buildout-versions = 1.7
cmd2 = 0.6.7
collective.recipe.template = 1.11
itsdangerous = 0.24
lxml = 3.3.4
meld3 =
0.6.1
0
meld3 =
1.0.
0
mr.developer = 1.30
netaddr = 0.7.11
prettytable = 0.7.3-nxd001
pyparsing = 2.0.1
pyparsing = 2.0.2
six = 1.6.1
slapos.core = 1.0.4
slapos.libnetworkcache = 0.14.1
...
...
@@ -142,26 +142,26 @@ stevedore = 0.15
xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1
#Required by:
#
slapos.core 1.0.3
#
Required by:
#
slapos.core==1.0.4
Flask = 0.10.1
#Required by:
#
slapos.core 1.0.3
#
Required by:
#
slapos.core==1.0.4
cliff = 1.6.1
#Required by:
#
slapos.core 1.0.3
#
Required by:
#
slapos.core==1.0.4
netifaces = 0.8-1
#Required by:
#
slapos.core 1.0.3
#
Required by:
#
slapos.core==1.0.4
requests = 2.2.1
#Required by:
#
slapos.core 1.0.3
#
Required by:
#
slapos.core==1.0.4
supervisor = 3.0
#Required by:
#
slapos.core 1.0.3
#
Required by:
#
slapos.core==1.0.4
zope.interface = 4.1.1
component/sqlite3/buildout.cfg
View file @
f6946c0a
...
...
@@ -5,8 +5,8 @@ parts =
[sqlite3]
recipe = slapos.recipe.cmmi
url = http://www.sqlite.org/201
3/sqlite-autoconf-3080200
.tar.gz
md5sum =
f62206713e6a08d4ccbc60b1fd712a1a
url = http://www.sqlite.org/201
4/sqlite-autoconf-3080403
.tar.gz
md5sum =
0f5459cde43cb269e5120ecd2c671ced
configure-options =
--disable-static
--enable-readline
...
...
software/html5as/instance_html5as.cfg
View file @
f6946c0a
...
...
@@ -56,7 +56,7 @@ nb_workers = 2
# Network
ip = $${slap-network-information:global-ipv6}
port = 808
0
port = 808
1
# Paths
# Log
...
...
software/html5as/software.cfg
View file @
f6946c0a
[buildout]
versions = versions
extensions = buildout-versions
extends =
../../stack/slapos.cfg
../../component/nginx/buildout.cfg
...
...
@@ -11,22 +6,12 @@ extends =
../../component/dash/buildout.cfg
../../component/tar/buildout.cfg
allow-hosts =
*.nexedi.org
*.python.org
*.sourceforge.net
www.slapos.org
launchpad.net
github.com
alastairs-place.net
www.alittletooquiet.net
parts =
dash
tar
curl
nginx
eggs
slapos-cookbook
template
template_nginx_conf
template_downloader
...
...
@@ -34,9 +19,6 @@ parts =
template_mime_types
instance_html5as
[eggs]
recipe = z3c.recipe.scripts
eggs = slapos.cookbook
[template]
recipe = slapos.recipe.template
...
...
@@ -49,13 +31,13 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance_html5as.cfg
output = ${buildout:directory}/template_html5as.cfg
md5sum =
579eceb768e8d25fb53338fc4fac694
4
md5sum =
41cb6178f760238ca276854873ef936
4
mode = 0644
[template_nginx_conf]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/nginx_conf.in
md5sum =
0ae1fb1c777c332d76f680c681a4f48a
md5sum =
61dc4c82bf48563228ce4dea6c5c6319
filename = nginx_conf.in
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
...
@@ -71,7 +53,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[template_downloader]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/downloader.in
md5sum =
7b374a03f4086fcae47491d449da1f09
md5sum =
9779e2db6c73d282f802b3407b390ede
filename = downloader.in
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
...
@@ -85,81 +67,120 @@ mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[versions]
zc.buildout = 1.6.0-dev-SlapOS-006
Jinja2 = 2.6
Pygments = 1.5
Werkzeug = 0.8.3
apache-libcloud = 0.12.3
async = 0.6.1
buildout-versions = 1.7
docutils = 0.9.1
hexagonit.recipe.cmmi = 1.6
ipython = 0.13
meld3 = 0.6.8
slapos.cookbook = 0.61
gitdb = 0.5.4
hexagonit.recipe.cmmi = 2.0
meld3 = 0.6.10
pycrypto = 2.6
rdiff-backup = 1.0.5
slapos.recipe.build = 0.11.6
slapos.recipe.cmmi = 0.1.1
slapos.recipe.template = 2.4.2
slapos.recipe.download = 1.0.dev-r4053
slapos.toolbox = 0.34.0
smmap = 0.8.2
z3c.recipe.scripts = 1.0.1
cliff = 1.4.4
cmd2 = 0.6.5.1
prettytable = 0.7.2
requests = 1.2.3
slapos.cookbook = 0.82
cffi = 0.8.2
cryptography = 0.3
plone.recipe.command = 1.1
pyOpenSSL = 0.14
six = 1.6.1
# Required by:
# cffi==0.8.2
pycparser = 2.10
# Required by:
# slapos.cookbook==0.82
lock-file = 2.0
# Required by:
# slapos.core==0.28.2
# slapos.core==0.35.1
# slapos.toolbox==0.34.0
Flask = 0.9
# Required by:
# slapos.
cookbook==0.61
PyXML = 0.8.4
# slapos.
toolbox==0.34.0
GitPython = 0.3.2.RC1
# Required by:
#
netaddr==0.7.7
Sphinx = 1.1.3
#
slapos.toolbox==0.34.0
atomize = 0.1.1
# Required by:
# slapos.cookbook==0.61
# slapos.toolbox==0.34.0
feedparser = 5.1.3
# Required by:
# slapos.cookbook==0.82
inotifyx = 0.2.0
# Required by:
# slapos.cookbook==0.
61
# slapos.core==0.
28.2
# slapos.cookbook==0.
82
# slapos.core==0.
35.1
# xml-marshaller==0.9.7
lxml =
2.3.5
lxml =
3.1.2
# Required by:
# slapos.cookbook==0.
61
netaddr = 0.7.
7
# slapos.cookbook==0.
82
netaddr = 0.7.
10
# Required by:
# slapos.core==0.
28.2
# slapos.core==0.
35.1
netifaces = 0.8
# Required by:
# slapos.cookbook==0.61
# slapos.core==0.28.2
# zc.buildout==1.6.0-dev-SlapOS-006
# zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846
# slapos.toolbox==0.34.0
paramiko = 1.10.1
# Required by:
# slapos.
cookbook==0.61
slapos.core = 0.28.2
# slapos.
toolbox==0.34.0
psutil = 0.7.0
# Required by:
# slapos.core==0.
28.2
supervisor = 3.0a12
# slapos.core==0.
35.1
pyflakes = 0.7
# Required by:
# slapos.cookbook==0.61
xml-marshaller = 0.9.7
# slapos.cookbook==0.82
pytz = 2013b
# Required by:
# slapos.cookbook==0.82
# slapos.core==0.35.1
# slapos.toolbox==0.34.0
# zc.buildout==1.6.0-dev-SlapOS-010
# zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846
# Required by:
# slapos.cookbook==0.61
zc.recipe.egg = 1.3.2
# slapos.cookbook==0.82
# slapos.toolbox==0.34.0
slapos.core = 0.35.1
# Required by:
# slapos.core==0.
28.2
zope.interface = 4.0.
1
# slapos.core==0.
35.1
supervisor = 3.0b
1
# Required by:
#
hexagonit.recipe.cmmi==1.6
hexagonit.recipe.download = 1.6nxd002
#
slapos.core==0.35.1
unittest2 = 0.5.1
# Required by:
# slapos.cookbook==0.82
# slapos.toolbox==0.34.0
xml-marshaller = 0.9.7
# Required by:
# slapos.core==0.35.1
zope.interface = 4.0.5
[networkcache]
# signature certificates of the following uploaders.
# Łukasz Nowak
...
...
software/html5as/templates/downloader.in
View file @
f6946c0a
...
...
@@ -6,4 +6,4 @@
rm -r {{ param_html5as['docroot'] }}/*
# Download and extract website tarball into docroot directory
exec {{ param_html5as['path_curl'] }} -s {{ download_url }} | {{ param_html5as['path_tar'] }} -z -x -C {{ param_html5as['docroot'] }}
exec {{ param_html5as['path_curl'] }} -
k
s {{ download_url }} | {{ param_html5as['path_tar'] }} -z -x -C {{ param_html5as['docroot'] }}
software/html5as/templates/nginx_conf.in
View file @
f6946c0a
...
...
@@ -13,6 +13,7 @@ events {
http {
include {{ param_html5as['path_mime_types'] }};
default_type application/octet-stream;
types_hash_bucket_size 64;
access_log {{ param_html5as['path_access_log'] }} combined;
index index.html;
...
...
stack/cloudooo.cfg
View file @
f6946c0a
...
...
@@ -92,17 +92,67 @@ develop +=
${:parts-directory}/cloudooo
[versions]
Jinja2 = 2.7.2
MarkupSafe = 0.21
Paste = 1.7.5.1
PasteDeploy = 1.5.2
PasteScript = 1.7.5
WSGIUtils = 0.7
argparse = 1.1
Werkzeug = 0.9.4
buildout-versions = 1.7
erp5.util = 0.4.37
cffi = 0.8.2
cliff = 1.6.1
cmd2 = 0.6.7
cryptography = 0.3
inotifyx = 0.2.0-1
itsdangerous = 0.24
lxml = 3.3.4
meld3 = 1.0.0
mr.developer = 1.30
netaddr = 0.7.11
netifaces = 0.8-1
plone.recipe.command = 1.1
psutil = 2.0.0
psutil = 2.1.0
pyOpenSSL = 0.14
pyparsing = 2.0.2
python-magic = 0.4.6
pytz = 2014.2
rdiff-backup = 1.0.5
requests = 2.2.1
six = 1.6.1
slapos.core = 1.0.4
slapos.recipe.build = 0.12
slapos.recipe.cmmi = 0.2
slapos.recipe.template = 2.5
stevedore = 0.15
supervisor = 3.0
xml-marshaller = 0.9.7
# Required by:
# slapos.core==1.0.4
Flask = 0.10.1
# Required by:
# PasteScript==1.7.5
# cloudooo==1.2.5-dev
PasteDeploy = 1.5.2
# Required by:
# cloudooo==1.2.5-dev
argparse = 1.1
# Required by:
# cloudooo==1.2.5-dev
erp5.util = 0.4.38
# Required by:
# slapos.cookbook==0.85
lock-file = 2.0
# Required by:
# cffi==0.8.2
pycparser = 2.10
# Required by:
# cloudooo==1.2.5-dev
# slapos.core==1.0.4
zope.interface = 4.1.1
stack/erp5/buildout.cfg
View file @
f6946c0a
...
...
@@ -572,7 +572,7 @@ PasteDeploy = 1.5.2
Pygments = 1.6
argparse = 1.2.1
coverage = 3.7.1
lxml = 3.3.
4
lxml = 3.3.
5
mr.developer = 1.30
setuptools = 2.2
...
...
@@ -623,10 +623,9 @@ zope.app.testing = 3.8.1
# Pinned versions
Flask = 0.10.1
GitPython = 0.3.2.RC1
MarkupSafe = 0.
19
MarkupSafe = 0.
21
MySQL-python = 1.2.5
PIL = 1.1.7
Paste = 1.7.5.1
Products.CMFActionIcons = 2.1.3
Products.DCWorkflowGraph = 0.4.1
Products.ExternalEditor = 1.1.0
...
...
@@ -636,16 +635,17 @@ Products.MimetypesRegistry = 2.0.5
Products.PluginRegistry = 1.3
Products.TIDStorage = 5.4.9
Products.ZSQLMethods = 2.13.4
PyPDF2 = 1.2
0
PyPDF2 = 1.2
1
PyXML = 0.8.5
Pympler = 0.3.1
StructuredText = 2.11.1
WSGIUtils = 0.7
Werkzeug = 0.9.4
apache-libcloud = 0.14.1
astroid = 1.
0.1
astroid = 1.
1.0
async = 0.6.1
atomize = 0.2.0
buildout-versions = 1.7
chardet = 2.2.1
cliff = 1.6.1
cmd2 = 0.6.7
...
...
@@ -653,7 +653,7 @@ csp-eventlet = 0.7.0
ecdsa = 0.11
elementtree = 1.2.7-20070827-preview
erp5.recipe.cmmiforcei686 = 0.1.3
erp5.util = 0.4.3
7
erp5.util = 0.4.3
8
erp5diff = 0.8.1.5
eventlet = 0.14.0
feedparser = 5.1.3
...
...
@@ -664,10 +664,11 @@ gitdb = 0.5.4
greenlet = 0.4.2
hexagonit.recipe.cmmi = 2.0
http-parser = 0.8.3
httplib2 = 0.
8
httplib2 = 0.
9
iniparse = 0.4
interval = 1.0.0
inotifyx = 0.2.0-1
interval = 1.0.0
ipdb = 0.8
ipython = 2.0.0
itsdangerous = 0.24
...
...
@@ -689,7 +690,7 @@ polib = 1.0.4
pprofile = 1.7.1
psutil = 2.1.0
pyflakes = 0.8.1
pylint = 1.
1
.0
pylint = 1.
2
.0
pyparsing = 2.0.2
python-ldap = 2.4.15
python-magic = 0.4.6
...
...
stack/slapos.cfg
View file @
f6946c0a
...
...
@@ -13,7 +13,6 @@ download-cache =
# Generate list of automatically chosen eggs version
extensions +=
buildout-versions
buildout.dumppickedversions
mr.developer
# Use shacache and lxml
...
...
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