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
Klaus Wölfel
slapos
Commits
077ed704
Commit
077ed704
authored
Jan 23, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into lamp
Conflicts: software/lamp-template-static/software.cfg
parents
24c7e784
c2148d59
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
212 additions
and
58 deletions
+212
-58
component/slapos/buildout.cfg
component/slapos/buildout.cfg
+1
-1
component/stunnel/buildout.cfg
component/stunnel/buildout.cfg
+2
-2
software/kumofs/software.cfg
software/kumofs/software.cfg
+90
-16
software/lamp-template-static/software.cfg
software/lamp-template-static/software.cfg
+62
-1
software/mysql-5.1/software.cfg
software/mysql-5.1/software.cfg
+56
-37
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+1
-1
No files found.
component/slapos/buildout.cfg
View file @
077ed704
...
@@ -122,7 +122,7 @@ meld3 = 0.6.7
...
@@ -122,7 +122,7 @@ meld3 = 0.6.7
netaddr = 0.7.6
netaddr = 0.7.6
setuptools = 0.6c12dev-r88846
setuptools = 0.6c12dev-r88846
slapos.core = 0.20
slapos.core = 0.20
slapos.libnetworkcache = 0.1
0
slapos.libnetworkcache = 0.1
1
xml-marshaller = 0.9.7
xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1
z3c.recipe.scripts = 1.0.1
zc.recipe.egg = 1.3.2
zc.recipe.egg = 1.3.2
...
...
component/stunnel/buildout.cfg
View file @
077ed704
...
@@ -17,8 +17,8 @@ filename = stunnel-4-hooks.py
...
@@ -17,8 +17,8 @@ filename = stunnel-4-hooks.py
[stunnel-4]
[stunnel-4]
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
url = http://mirror.bit.nl/stunnel/stunnel-4.5
0
.tar.gz
url = http://mirror.bit.nl/stunnel/stunnel-4.5
2
.tar.gz
md5sum =
d68b4565294496a8bdf23c728a679f53
md5sum =
f5e713dda0e8efa659f372832ecd0c2c
pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook
pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook
configure-options =
configure-options =
--enable-ipv6
--enable-ipv6
...
...
software/kumofs/software.cfg
View file @
077ed704
[buildout]
[buildout]
extensions =
buildout-versions
find-links +=
find-links +=
http://www.nexedi.org/static/packages/source/slapos.buildout/
http://www.nexedi.org/static/packages/source/slapos.buildout/
extends =
extends =
../../component/git/buildout.cfg
../../component/kumo/buildout.cfg
../../component/kumo/buildout.cfg
../../component/python-2.7/buildout.cfg
../../component/dcron/buildout.cfg
../../component/dcron/buildout.cfg
../../component/stunnel/buildout.cfg
../../component/stunnel/buildout.cfg
../../component/rdiff-backup/buildout.cfg
../../component/rdiff-backup/buildout.cfg
...
@@ -17,20 +18,24 @@ allow-hosts =
...
@@ -17,20 +18,24 @@ allow-hosts =
*.nexedi.org
*.nexedi.org
*.python.org
*.python.org
*.sourceforge.net
*.sourceforge.net
alastairs-place.net
dist.repoze.org
dist.repoze.org
effbot.org
effbot.org
github.com
github.com
peak.telecommunity.com
peak.telecommunity.com
psutil.googlecode.com
psutil.googlecode.com
www.dabeaz.com
www.dabeaz.com
www.owlfish.com
versions = versions
versions = versions
parts
+
=
parts =
# Create instance template
# Create instance template
#TODO : list here all parts.
template
template
libxslt
rdiff-backup
dcron
kumo
stunnel
eggs
eggs
instance-recipe-egg
instance-recipe-egg
...
@@ -45,12 +50,10 @@ module = kumofs
...
@@ -45,12 +50,10 @@ module = kumofs
[instance-recipe-egg]
[instance-recipe-egg]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python = python2.7
eggs = ${instance-recipe:egg}
eggs = ${instance-recipe:egg}
[eggs]
[eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python = python2.7
eggs =
eggs =
${lxml-python:egg}
${lxml-python:egg}
...
@@ -63,18 +66,89 @@ output = ${buildout:directory}/template.cfg
...
@@ -63,18 +66,89 @@ output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
[versions]
[versions]
slapos.cookbook = 0.13
# Use SlapOS patched zc.buildout
zc.buildout = 1.6.0-dev-SlapOS-003
erp5.recipe.cmmiforcei686 = 0.1.1
Jinja2 = 2.6
Werkzeug = 0.8.2
buildout-versions = 1.7
erp5.recipe.cmmiforcei686 = 0.1.3
hexagonit.recipe.cmmi = 1.5.0
hexagonit.recipe.cmmi = 1.5.0
meld3 = 0.6.8
rdiff-backup = 1.0.5
slapos.cookbook = 0.38
slapos.recipe.template = 2.2
# Required by:
# slapos.core==0.21
Flask = 0.8
# Required by:
# slapos.cookbook==0.38
PyXML = 0.8.5
# Required by:
# hexagonit.recipe.cmmi==1.5.0
hexagonit.recipe.download = 1.5.0
hexagonit.recipe.download = 1.5.0
# Required by slapos.cookbook==0.13
# Required by:
slapos.core = 0.2
# slapos.cookbook==0.38
collective.recipe.template = 1.8
# slapos.core==0.21
netaddr = 0.7.5
# xml-marshaller==0.9.7
lxml = 2.3.3
# Required by:
# slapos.cookbook==0.38
netaddr = 0.7.6
# Required by:
# slapos.core==0.21
netifaces = 0.6
# Required by:
# slapos.cookbook==0.38
# slapos.core==0.21
# zc.buildout==1.6.0-dev-SlapOS-003
# zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846
# Required by:
# slapos.cookbook==0.38
slapos.core = 0.21
# Required by:
# slapos.core==0.21
supervisor = 3.0a12
# Required by:
# slapos.cookbook==0.38
xml-marshaller = 0.9.7
xml-marshaller = 0.9.7
setuptools = 0.6c12dev-r88795
# Use SlapOS patched zc.buildout
# Required by:
zc.buildout = 1.5.3-dev-SlapOS-010
# erp5.recipe.cmmiforcei686==0.1.3
# slapos.cookbook==0.38
zc.recipe.egg = 1.3.2
# Required by:
# slapos.core==0.21
zope.interface = 3.8.0
[networkcache]
# Cedric de Saint Martin signature certificate
signature-certificate-list =
-----BEGIN PRIVATE KEY-----
MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBANqRqW69hpRtqjuX
maEl9cwKPSb/Vu170OUqaNrZYaMnAv1T3pTU8cob5IjuC/HUZiiX/OEIxIsRZuKO
H8visw4PQEqSbSKvqOmJONirzXDHyye0Sf9yDRyEubAzbRjsP7wQabAkHhvsUGTK
dALIIhoAVTGkDBMryxqMJ9MHzyLjAgMBAAECgYEAmtszIUvUqxsbzob1iTBc+wiS
FSw6CZ58/bDTg6Mawz6jppqii+5ntRuYCtAl1Fv5WW998m6E2kclDwVFT+45j0AO
JroHGY74Egy54Wl7D2hE5ldJKy4LL6bPdM+FQy3S46Ekc7OyStU2LmMmWHdVMlzx
p7UQJ8UeE/UiBj5hUBkCQQD23HriV7cuYqJLzP689CWvWFjjJFtpuJBtYve7aqNb
DsL5i64H0eMkDyQzYavZfZg7lO9KAy0PbofInXI9owPHAkEA4qkN5MUZQcNb3zRd
TtPdA8WWRuArnAN4U3BZPMHu2UQ9U9gWedY2NzzqYGLw4Hx7XH54fRExG2L35LyA
zD9wBQJAS42rZn7mJ6I0ffKdvIMUzZfCjLJh7/d27KOvooK+wG3CKtIfT3FjjXO8
5qTsDcKsxv+MRSC3t9NiZ3oYrtinnQJBAJBrozynEYbDkaBQ3ztA50xl83DJmT/Z
Piv8JAAAmc26G1F3GCsdgIIFwFkV8eE3r+qpcuBNufp3Pvhx26dIrHkCQQDzFZp4
VDhTCQQoEBrGXoz6TRzmGfu8VpQZMXdL7O6aGNVqQGfsWQS7Sh+8iXsOi2APTAjr
xUL3fZnXAjr6AnZC
-----END PRIVATE KEY-----
software/lamp-template-static/software.cfg
View file @
077ed704
[buildout]
[buildout]
extensions += buildout-versions
versions = versions
versions = versions
parts =
parts =
...
@@ -37,9 +39,68 @@ eggs = ${instance-recipe:egg}
...
@@ -37,9 +39,68 @@ eggs = ${instance-recipe:egg}
[versions]
[versions]
# Use SlapOS patched zc.buildout
# Use SlapOS patched zc.buildout
zc.buildout = 1.
5.3-dev-SlapOS-010
zc.buildout = 1.
6.0-dev-SlapOS-003
slapos.cookbook = 0.20
slapos.cookbook = 0.20
# Generated by buildout-versions
Jinja2 = 2.6
Werkzeug = 0.8.2
buildout-versions = 1.7
hexagonit.recipe.cmmi = 1.5.0
hexagonit.recipe.download = 1.5.0
meld3 = 0.6.8
plone.recipe.command = 1.1
slapos.recipe.template = 2.2
# Required by:
# slapos.core==0.21
Flask = 0.8
# Required by:
# slapos.cookbook==0.20
PyXML = 0.8.4
# Required by:
# slapos.cookbook==0.20
# slapos.core==0.21
# xml-marshaller==0.9.7
lxml = 2.3.3
# Required by:
# slapos.cookbook==0.20
netaddr = 0.7.6
# Required by:
# slapos.core==0.21
netifaces = 0.6
# Required by:
# slapos.cookbook==0.20
# slapos.core==0.21
# zc.buildout==1.6.0-dev-SlapOS-003
# zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846
# Required by:
# slapos.cookbook==0.20
slapos.core = 0.21
# Required by:
# slapos.core==0.21
supervisor = 3.0a12
# Required by:
# slapos.cookbook==0.20
xml-marshaller = 0.9.7
# Required by:
# slapos.cookbook==0.20
zc.recipe.egg = 1.3.2
# Required by:
# slapos.core==0.21
zope.interface = 3.8.0
[downloadcache-workaround]
[downloadcache-workaround]
# workaround irritating problem of hexagonit.recipe.cmmi which automatically
# workaround irritating problem of hexagonit.recipe.cmmi which automatically
# creates download cache, which in turn switches builout to "semi-offline" mode
# creates download cache, which in turn switches builout to "semi-offline" mode
...
...
software/mysql-5.1/software.cfg
View file @
077ed704
[buildout]
[buildout]
extensions =
buildout-versions
find-links +=
find-links +=
http://www.nexedi.org/static/packages/source/slapos.buildout/
http://www.nexedi.org/static/packages/source/slapos.buildout/
extends =
extends =
../../component/mysql-5.1/buildout.cfg
../../component/dcron/buildout.cfg
../../component/dcron/buildout.cfg
../../component/logrotate/buildout.cfg
../../component/logrotate/buildout.cfg
../../component/
stunnel
/buildout.cfg
../../component/
lxml-python
/buildout.cfg
../../component/
python-2.7
/buildout.cfg
../../component/
mysql-5.1
/buildout.cfg
../../component/perl/buildout.cfg
../../component/perl/buildout.cfg
../../component/xtrabackup/buildout.cfg
../../component/rdiff-backup/buildout.cfg
../../component/rdiff-backup/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/stunnel/buildout.cfg
../../component/xtrabackup/buildout.cfg
../../stack/shacache-client.cfg
../../stack/shacache-client.cfg
# Use only quite well working sites.
# Use only quite well working sites.
...
@@ -19,23 +20,27 @@ allow-hosts =
...
@@ -19,23 +20,27 @@ allow-hosts =
*.nexedi.org
*.nexedi.org
*.python.org
*.python.org
*.sourceforge.net
*.sourceforge.net
alastairs-place.net
dist.repoze.org
dist.repoze.org
effbot.org
effbot.org
github.com
github.com
peak.telecommunity.com
peak.telecommunity.com
psutil.googlecode.com
psutil.googlecode.com
www.dabeaz.com
www.dabeaz.com
www.owlfish.com
versions = versions
versions = versions
parts +=
parts =
#TODO : list here all parts.
# Create instance template
template
template
libxslt
rdiff-backup
stunnel
logrotate
xtrabackup
dcron
mysql-5.1
eggs
eggs
instance-recipe-egg
instance-recipe-egg
rdiff-backup
# XXX: Workaround of SlapOS limitation
# XXX: Workaround of SlapOS limitation
# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
...
@@ -48,12 +53,10 @@ module = mysql
...
@@ -48,12 +53,10 @@ module = mysql
[instance-recipe-egg]
[instance-recipe-egg]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python = python2.7
eggs = ${instance-recipe:egg}
eggs = ${instance-recipe:egg}
[eggs]
[eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python = python2.7
eggs =
eggs =
${lxml-python:egg}
${lxml-python:egg}
...
@@ -66,60 +69,55 @@ output = ${buildout:directory}/template.cfg
...
@@ -66,60 +69,55 @@ output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
[versions]
[versions]
zc.buildout = 1.5.3-dev-SlapOS-009
zc.buildout = 1.6.0-dev-SlapOS-003
# Use old cookbook version
slapos.cookbook = 0.13
slapos.cookbook = 0.13
Jinja2 = 2.6
Jinja2 = 2.6
Werkzeug = 0.7.1
Werkzeug = 0.8.2
buildout-versions = 1.7
hexagonit.recipe.cmmi = 1.5.0
hexagonit.recipe.cmmi = 1.5.0
meld3 = 0.6.7
hexagonit.recipe.download = 1.5.0
meld3 = 0.6.8
rdiff-backup = 1.0.5
rdiff-backup = 1.0.5
slapos.recipe.template =
1.1
slapos.recipe.template =
2.2
# Required by:
# Required by:
# slapos.core==0.
14
# slapos.core==0.
21
Flask = 0.
7.2
Flask = 0.
8
# Required by:
# Required by:
# slapos.cookbook==0.13
# slapos.cookbook==0.13
PyXML = 0.8.4
PyXML = 0.8.4
# Required by:
# slapos.recipe.template==1.1
collective.recipe.template = 1.9
# Required by:
# hexagonit.recipe.cmmi==1.5.0
hexagonit.recipe.download = 1.5.0
# Required by:
# Required by:
# slapos.cookbook==0.13
# slapos.cookbook==0.13
# slapos.core==0.
14
# slapos.core==0.
21
# xml-marshaller==0.9.7
# xml-marshaller==0.9.7
lxml = 2.3
lxml = 2.3
.3
# Required by:
# Required by:
# slapos.cookbook==0.13
# slapos.cookbook==0.13
netaddr = 0.7.6
netaddr = 0.7.6
# Required by:
# Required by:
# slapos.core==0.
14
# slapos.core==0.
21
netifaces = 0.
4
netifaces = 0.
6
# Required by:
# Required by:
# slapos.cookbook==0.13
# slapos.cookbook==0.13
# slapos.core==0.
14
# slapos.core==0.
21
# zc.buildout==1.
5.3-dev-SlapOS-009
# zc.buildout==1.
6.0-dev-SlapOS-003
# zc.recipe.egg==1.3.2
# zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846
setuptools = 0.6c12dev-r88846
# Required by:
# Required by:
# slapos.cookbook==0.13
# slapos.cookbook==0.13
slapos.core = 0.
14
slapos.core = 0.
21
# Required by:
# Required by:
# slapos.core==0.
14
# slapos.core==0.
21
supervisor = 3.0a1
0
supervisor = 3.0a1
2
# Required by:
# Required by:
# slapos.cookbook==0.13
# slapos.cookbook==0.13
...
@@ -130,5 +128,26 @@ xml-marshaller = 0.9.7
...
@@ -130,5 +128,26 @@ xml-marshaller = 0.9.7
zc.recipe.egg = 1.3.2
zc.recipe.egg = 1.3.2
# Required by:
# Required by:
# slapos.core==0.14
# slapos.core==0.21
zope.interface = 3.7.0
zope.interface = 3.8.0
\ No newline at end of file
[networkcache]
# Cedric de Saint Martin signature certificate
signature-certificate-list =
-----BEGIN PRIVATE KEY-----
MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBANqRqW69hpRtqjuX
maEl9cwKPSb/Vu170OUqaNrZYaMnAv1T3pTU8cob5IjuC/HUZiiX/OEIxIsRZuKO
H8visw4PQEqSbSKvqOmJONirzXDHyye0Sf9yDRyEubAzbRjsP7wQabAkHhvsUGTK
dALIIhoAVTGkDBMryxqMJ9MHzyLjAgMBAAECgYEAmtszIUvUqxsbzob1iTBc+wiS
FSw6CZ58/bDTg6Mawz6jppqii+5ntRuYCtAl1Fv5WW998m6E2kclDwVFT+45j0AO
JroHGY74Egy54Wl7D2hE5ldJKy4LL6bPdM+FQy3S46Ekc7OyStU2LmMmWHdVMlzx
p7UQJ8UeE/UiBj5hUBkCQQD23HriV7cuYqJLzP689CWvWFjjJFtpuJBtYve7aqNb
DsL5i64H0eMkDyQzYavZfZg7lO9KAy0PbofInXI9owPHAkEA4qkN5MUZQcNb3zRd
TtPdA8WWRuArnAN4U3BZPMHu2UQ9U9gWedY2NzzqYGLw4Hx7XH54fRExG2L35LyA
zD9wBQJAS42rZn7mJ6I0ffKdvIMUzZfCjLJh7/d27KOvooK+wG3CKtIfT3FjjXO8
5qTsDcKsxv+MRSC3t9NiZ3oYrtinnQJBAJBrozynEYbDkaBQ3ztA50xl83DJmT/Z
Piv8JAAAmc26G1F3GCsdgIIFwFkV8eE3r+qpcuBNufp3Pvhx26dIrHkCQQDzFZp4
VDhTCQQoEBrGXoz6TRzmGfu8VpQZMXdL7O6aGNVqQGfsWQS7Sh+8iXsOi2APTAjr
xUL3fZnXAjr6AnZC
-----END PRIVATE KEY-----
software/slaprunner/software.cfg
View file @
077ed704
...
@@ -49,7 +49,7 @@ buildout-versions = 1.7
...
@@ -49,7 +49,7 @@ buildout-versions = 1.7
hexagonit.recipe.cmmi = 1.5.0
hexagonit.recipe.cmmi = 1.5.0
meld3 = 0.6.7
meld3 = 0.6.7
slapos.cookbook = 0.31
slapos.cookbook = 0.31
slapos.libnetworkcache = 0.1
0
slapos.libnetworkcache = 0.1
1
slapos.recipe.template = 2.2
slapos.recipe.template = 2.2
slapos.toolbox = 0.8
slapos.toolbox = 0.8
...
...
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