Commit 90673aa4 authored by Rafael Monnerat's avatar Rafael Monnerat

Update Release Candidate

parents fe42dbab 21a25f0f
......@@ -33,9 +33,9 @@ md5sum = 2202b18f269ad606d70e1864857ed93c
[apache]
# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
recipe = slapos.recipe.cmmi
version = 2.4.18
version = 2.4.23
url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
md5sum = 3690b3cc991b7dfd22aea9e1264a11b9
md5sum = 04f19c60e810c028f5240a062668a688
pre-configure =
cp -ar ${apr:location}/apr-${apr:version} srclib/apr/ &&
cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util
......
......@@ -36,8 +36,8 @@ environment-extra =
[golang16]
<= golang-common
url = https://storage.googleapis.com/golang/go1.6.2.src.tar.gz
md5sum = d1b50fa98d9a71eeee829051411e6207
url = https://storage.googleapis.com/golang/go1.6.3.src.tar.gz
md5sum = bf3fce6ccaadd310159c9e874220e2a2
# go1.6 needs go1.4 to bootstrap
environment-extra =
......
......@@ -16,7 +16,7 @@ parts =
recipe = slapos.recipe.build:gitclone
git-executable = ${git:location}/bin/git
repository = https://lab.nexedi.com/nexedi/helloweb.git
revision = 0487fa7bc88e83ce8b97d784ab11354aa8fac603
revision = 39fd89a35718c3b4828296efcd9a45b6c9bbd13b
location = ${buildout:parts-directory}/helloweb
......
......@@ -48,29 +48,29 @@ gitdb = 0.6.4
pycrypto = 2.6.1
slapos.recipe.download = 1.0
slapos.recipe.template = 2.8
slapos.toolbox = 0.55
slapos.toolbox = 0.56
smmap = 0.9.0
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
GitPython = 2.0.6
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
atomize = 0.2.0
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
feedparser = 5.2.1
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
lockfile = 0.12.2
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
paramiko = 2.0.1
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
rpdb = 0.1.5
......@@ -11,29 +11,29 @@ plone.recipe.command = 1.1
pycrypto = 2.6.1
rdiff-backup = 1.0.5
slapos.recipe.template = 2.8
slapos.toolbox = 0.55
slapos.toolbox = 0.56
smmap = 0.9.0
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
GitPython = 2.0.6
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
atomize = 0.2.0
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
feedparser = 5.2.1
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
lockfile = 0.12.2
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
paramiko = 2.0.1
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
rpdb = 0.1.5
......@@ -2,9 +2,12 @@
extends =
../../stack/cloudooo.cfg
../../stack/logrotate/buildout.cfg
parts =
${cloudooo-buildout:parts}
[cloudooo-buildout]
parts =
${stack-cloudooo-buildout:parts}
# Local development
cloudooo-develop
slapos-cookbook-develop
......
......@@ -2,7 +2,7 @@
extends =
software-common.cfg
parts +=
parts =
${cloudooo-buildout:parts}
template-cloudooo
......
......@@ -281,6 +281,7 @@ context-extra =
[gitlab-bin]
recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:bin}/${:_buildout_section_name_}
parameters-extra = true
# NOTE $HOME needed to pick gitconfig
environment =
BUNDLE_GEMFILE = {{ gitlab_repository_location }}/Gemfile
......
......@@ -252,7 +252,7 @@ md5sum = 8f1c52ed223ee2c2d07c6c79bcd2f6c0
[instance-gitlab.cfg.in]
<= download-file
md5sum = de4c2067597b39fb7db06c15ce6a1878
md5sum = d3158d58e7fea9a656a8ef6e238a919b
[macrolib.cfg.in]
<= download-file
......
......@@ -149,7 +149,8 @@
"bootstrap-script-url": {
"title": "Virtual Machines bootstrap script URL.",
"description": "If dedicaced disk image is used, this script will be downloaded and run at first boot of the virtual machine. Set md5sum to URL like: http://example.com/file#MD5SUM. Get file in vm at http://10.0.2.100/vm-bootstrap.",
"type": "uri"
"type": "string",
"format": "uri"
},
"cluster-data": {
"title": "Text content to share with virtual machines.",
......@@ -338,7 +339,8 @@
"bootstrap-script-url": {
"title": "VM bootstrap script URL.",
"description": "If dedicaced disk image is used, this script will be downloaded and run at first boot of the virtual machine. Set md5sum to URL like: http://example.com/file#MD5SUM. Get file in vm at http://10.0.2.100/vm-bootstrap.",
"type": "uri"
"type": "string",
"format": "uri"
},
"data-to-vm": {
"title": "Text content to send to this virtual machine.",
......
......@@ -106,8 +106,8 @@ md5sum = febd3ed58043ce1367b86cf6e4e69700
slapos.recipe.template = 2.9
# patched egg
ZODB3 = 3.10.5+SlapOSPatched001
# Required by slapos.toolbox==0.55
slapos.toolbox = 0.55
# Required by slapos.toolbox==0.56
slapos.toolbox = 0.56
apache-libcloud = 0.20.1
atomize = 0.2.0
ecdsa = 0.13
......
......@@ -112,15 +112,15 @@ gitdb = 0.6.4
plone.recipe.command = 1.1
pycrypto = 2.6.1
slapos.recipe.template = 2.7
slapos.toolbox = 0.55
slapos.toolbox = 0.56
smmap = 0.9.0
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
GitPython = 2.0.6
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
atomize = 0.2.0
# Required by:
......@@ -128,11 +128,11 @@ atomize = 0.2.0
backports.ssl-match-hostname = 3.4.0.2
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
feedparser = 5.1.3
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
lockfile = 0.12.2
# Required by:
......@@ -140,10 +140,10 @@ lockfile = 0.12.2
miniupnpc = 1.9
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
paramiko = 2.0.1
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
rpdb = 0.1.5
......@@ -19,25 +19,25 @@ gunicorn = 19.5.0
prettytable = 0.7.2
pycrypto = 2.6.1
slapos.recipe.template = 2.9
slapos.toolbox = 0.55
slapos.toolbox = 0.56
smmap = 0.9.0
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
GitPython = 2.0.6
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
atomize = 0.2.0
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
feedparser = 5.2.1
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
lockfile = 0.12.2
# Required by:
# slapos.toolbox==0.55
# slapos.toolbox==0.56
paramiko = 2.0.1
......@@ -54,4 +54,4 @@ revision = 4dfdf05a89445a9286dbdf364d495bedf10f9394
[versions]
scipy = 0.15.1
msgpack-python = 0.4.6
wendelin.core = 0.6
wendelin.core = 0.7
......@@ -35,6 +35,10 @@ extends =
versions = versions
parts =
${stack-cloudooo-buildout:parts}
[stack-cloudooo-buildout]
parts =
libreoffice-bin
stunnel
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment