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
Łukasz Nowak
slapos
Commits
fc0c1d44
Commit
fc0c1d44
authored
Apr 21, 2015
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into re6st-master
parents
eea3c282
828d9382
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
34 additions
and
36 deletions
+34
-36
CHANGES.txt
CHANGES.txt
+5
-0
component/babeld/buildout.cfg
component/babeld/buildout.cfg
+2
-3
component/gnutls/buildout.cfg
component/gnutls/buildout.cfg
+2
-2
component/libyaml/buildout.cfg
component/libyaml/buildout.cfg
+2
-2
component/perl/buildout.cfg
component/perl/buildout.cfg
+2
-2
component/ruby/buildout.cfg
component/ruby/buildout.cfg
+11
-15
setup.py
setup.py
+1
-1
software/re6stnet/software.cfg
software/re6stnet/software.cfg
+1
-3
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+2
-2
stack/slapos.cfg
stack/slapos.cfg
+6
-6
No files found.
CHANGES.txt
View file @
fc0c1d44
Changes
Changes
=======
=======
0.100 (2015-04-20)
------------------
* re6stnet recipe: re6st-registry log can now be reopened with SIGUSR1
* re6stnet recipe: re6st certificate generation is improved.
0.99 (2015-04-10)
0.99 (2015-04-10)
-----------------
-----------------
* re6stnet: new recipe to deploy re6st registry (re6st master) with slapos.
* re6stnet: new recipe to deploy re6st registry (re6st master) with slapos.
...
...
component/babeld/buildout.cfg
View file @
fc0c1d44
...
@@ -6,9 +6,8 @@ parts = babeld
...
@@ -6,9 +6,8 @@ parts = babeld
[babeld]
[babeld]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
# Babeld version v1.6.0-nxd1
url = https://lab.nexedi.cn/rafael/babeld/repository/archive.tar.gz?ref=v1.6.0-nxd1
url = http://git.erp5.org/gitweb/babeld.git/snapshot/e39e62b5ecbce9d488b4f2a0999f8b5e7612e75f.tar.gz
md5sum = 1f269d01321103873b8d245df19984f0
md5sum = 3a2697f3f6e5815632809c84c004bfaa
configure-command =
configure-command =
echo "No configure.."
echo "No configure.."
...
...
component/gnutls/buildout.cfg
View file @
fc0c1d44
...
@@ -11,8 +11,8 @@ parts = gnutls
...
@@ -11,8 +11,8 @@ parts = gnutls
[gpg-error]
[gpg-error]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.1
8
.tar.bz2
url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.1
9
.tar.bz2
md5sum =
12312802d2065774b787cbfc22cc04e9
md5sum =
c04c16245b92829281f43b5bef7d16da
[gcrypt]
[gcrypt]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
...
...
component/libyaml/buildout.cfg
View file @
fc0c1d44
...
@@ -5,5 +5,5 @@ parts =
...
@@ -5,5 +5,5 @@ parts =
[libyaml]
[libyaml]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://pyyaml.org/download/libyaml/yaml-0.1.
4
.tar.gz
url = http://pyyaml.org/download/libyaml/yaml-0.1.
6
.tar.gz
md5sum =
36c852831d02cf90508c29852361d01b
md5sum =
5fe00cda18ca5daeb43762b80c38e06e
component/perl/buildout.cfg
View file @
fc0c1d44
...
@@ -7,9 +7,9 @@ parts =
...
@@ -7,9 +7,9 @@ parts =
[perl]
[perl]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
version = 5.20.
1
version = 5.20.
2
url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
md5sum =
ede5166f949d9a07163bc5b086be9759
md5sum =
21062666f1c627aeb6dbff3c6952738b
siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
patch-options = -p1
patch-options = -p1
patches =
patches =
...
...
component/ruby/buildout.cfg
View file @
fc0c1d44
...
@@ -2,32 +2,28 @@
...
@@ -2,32 +2,28 @@
extends =
extends =
../gdbm/buildout.cfg
../gdbm/buildout.cfg
../openssl/buildout.cfg
../libffi/buildout.cfg
../zlib/buildout.cfg
../readline/buildout.cfg
../ncurses/buildout.cfg
../libyaml/buildout.cfg
../libyaml/buildout.cfg
../openssl/buildout.cfg
../ncurses/buildout.cfg
../ncurses/buildout.cfg
../openssl/buildout.cfg
../readline/buildout.cfg
../readline/buildout.cfg
../xz-utils/buildout.cfg
../zlib/buildout.cfg
../zlib/buildout.cfg
parts = ruby
parts = ruby
[ruby-
1.9.3
]
[ruby-
2.2
]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://ftp.ruby-lang.org/pub/ruby/
1.9/ruby-1.9.3-p194.tar.g
z
url = http://ftp.ruby-lang.org/pub/ruby/
2.2/ruby-2.2.2.tar.x
z
md5sum =
bc0c715c69da4d1d8bd57069c19f6c0e
md5sum =
dbce9b9d79d90f213ba8d448b0b6ed86
configure-options =
configure-options =
--enable-shared --enable-rpath --disable-install-doc
--enable-shared --enable-rpath --disable-install-doc
--enable-pthread --enable-ipv6
--with-out-ext=tk,tk/tkutil,win32,win32ole
--with-ext=bigdecimal,continuation,curses,date,digest,dl,etc,fcntl,iconv,io,json,nkf,openssl,pathname,psych,pty,racc,readline,ripper,sdbm,socket,stringio,strscan,syck,syslog,zlib
environment =
environment =
CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gdbm:location}/include -I${openssl:location}/include
PATH=${xz-utils:location}/bin:%(PATH)s
LDFLAGS=-L${zlib:location}/lib -L${libyaml:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib
CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${openssl:location}/include -I${readline:location}/include -I${zlib:location}/include
LDFLAGS=-L${gdbm:location}/lib -L${libffi:location}/lib -L${libyaml:location}/lib -L${ncurses:location}/lib -L${openssl:location}/lib -L${readline:location}/lib -L${zlib:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${zlib:location}/lib
PKG_CONFIG_PATH=${libyaml:location}/lib/
PKG_CONFIG_PATH=${libyaml:location}/lib/
[ruby-1.9]
<= ruby-1.9.3
[ruby]
[ruby]
<= ruby-2.2
setup.py
View file @
fc0c1d44
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import
glob
import
glob
import
os
import
os
version
=
'0.10
0
.dev0'
version
=
'0.10
1
.dev0'
name
=
'slapos.cookbook'
name
=
'slapos.cookbook'
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
...
...
software/re6stnet/software.cfg
View file @
fc0c1d44
...
@@ -13,7 +13,6 @@ extends =
...
@@ -13,7 +13,6 @@ extends =
develop =
develop =
${:parts-directory}/re6stnet-repository
${:parts-directory}/re6stnet-repository
${:parts-directory}/slapos.cookbook-repository
parts =
parts =
slapos-cookbook
slapos-cookbook
...
@@ -48,7 +47,7 @@ eggs =
...
@@ -48,7 +47,7 @@ eggs =
[re6stnet-repository]
[re6stnet-repository]
repository = http://git.erp5.org/repos/re6stnet.git
repository = http://git.erp5.org/repos/re6stnet.git
branch = re6st-slapos
branch = re6st-slapos
revision =
revision =
8130c7380cbf3f13bdc4e5ecb8e792fb7d2b7b2e
[slapos.cookbook-repository]
[slapos.cookbook-repository]
...
@@ -128,7 +127,6 @@ stop-on-error = true
...
@@ -128,7 +127,6 @@ stop-on-error = true
update-command = ${:command}
update-command = ${:command}
command =
command =
grep parts ${buildout:develop-eggs-directory}/re6stnet.egg-link
grep parts ${buildout:develop-eggs-directory}/re6stnet.egg-link
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
[versions]
[versions]
apache-libcloud = 0.17.0
apache-libcloud = 0.17.0
...
...
stack/erp5/buildout.cfg
View file @
fc0c1d44
...
@@ -596,7 +596,7 @@ Products.PluginRegistry = 1.3
...
@@ -596,7 +596,7 @@ Products.PluginRegistry = 1.3
Products.TIDStorage = 5.4.9
Products.TIDStorage = 5.4.9
PyPDF2 = 1.24
PyPDF2 = 1.24
PyXML = 0.8.5
PyXML = 0.8.5
Pympler = 0.4
Pympler = 0.4
.1
StructuredText = 2.11.1
StructuredText = 2.11.1
WSGIUtils = 0.7
WSGIUtils = 0.7
apache-libcloud = 0.17.0
apache-libcloud = 0.17.0
...
@@ -613,7 +613,7 @@ five.localsitemanager = 2.0.5
...
@@ -613,7 +613,7 @@ five.localsitemanager = 2.0.5
gitdb = 0.6.4
gitdb = 0.6.4
greenlet = 0.4.5
greenlet = 0.4.5
http-parser = 0.8.3
http-parser = 0.8.3
httplib2 = 0.9
httplib2 = 0.9
.1
huBarcode = 1.0.0
huBarcode = 1.0.0
interval = 1.0.0
interval = 1.0.0
ipdb = 0.8
ipdb = 0.8
...
...
stack/slapos.cfg
View file @
fc0c1d44
...
@@ -103,7 +103,7 @@ eggs =
...
@@ -103,7 +103,7 @@ eggs =
[versions]
[versions]
# Use SlapOS patched zc.buildout
# Use SlapOS patched zc.buildout
zc.buildout = 1.7.1.post
6
zc.buildout = 1.7.1.post
7
# Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
# Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
zc.recipe.egg = 1.3.2.post2
zc.recipe.egg = 1.3.2.post2
# Use own version of h.r.download to be able to open .xz and .lz archives
# Use own version of h.r.download to be able to open .xz and .lz archives
...
@@ -116,24 +116,24 @@ buildout-versions = 1.7
...
@@ -116,24 +116,24 @@ buildout-versions = 1.7
cffi = 0.9.2
cffi = 0.9.2
collective.recipe.template = 1.11
collective.recipe.template = 1.11
cmd2 = 0.6.8
cmd2 = 0.6.8
cryptography = 0.8.
1
cryptography = 0.8.
2
inotifyx = 0.2.2
inotifyx = 0.2.2
itsdangerous = 0.24
itsdangerous = 0.24
lxml = 3.4.
2
lxml = 3.4.
3
meld3 = 1.0.2
meld3 = 1.0.2
mr.developer = 1.31
mr.developer = 1.31
netaddr = 0.7.14
netaddr = 0.7.14
pbr = 0.10.8
pbr = 0.10.8
prettytable = 0.7.2
prettytable = 0.7.2
psutil = 2.2.1
psutil = 2.2.1
pyOpenSSL = 0.1
4
pyOpenSSL = 0.1
5.1
pyparsing = 2.0.3
pyparsing = 2.0.3
pytz = 2015.2
pytz = 2015.2
requests = 2.6.0
requests = 2.6.0
setuptools = 1
2.0.4
setuptools = 1
5.1
simplejson = 3.6.5
simplejson = 3.6.5
six = 1.9.0
six = 1.9.0
slapos.cookbook = 0.
99
slapos.cookbook = 0.
100
slapos.core = 1.3.9
slapos.core = 1.3.9
slapos.libnetworkcache = 0.14.2
slapos.libnetworkcache = 0.14.2
slapos.recipe.build = 0.21
slapos.recipe.build = 0.21
...
...
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