Commit 165619c1 authored by Jérome Perrin's avatar Jérome Perrin

Merge remote-tracking branch 'nexedi/master' into 1.0

parents 4bc07be4 e53b8e86
...@@ -8,8 +8,8 @@ extends = ...@@ -8,8 +8,8 @@ extends =
[file] [file]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.astron.com/pub/file/file-5.22.tar.gz url = ftp://ftp.astron.com/pub/file/file-5.23.tar.gz
md5sum = 8fb13e5259fe447e02c4a37bc7225add md5sum = 61db35209ce71a6d576392ce6e1d2f80
configure-options = configure-options =
--disable-static --disable-static
environment = environment =
......
...@@ -10,8 +10,8 @@ parts = ...@@ -10,8 +10,8 @@ parts =
[mpfr] [mpfr]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.xz url = http://ftp.gnu.org/gnu/mpfr/mpfr-3.1.3.tar.xz
md5sum = e3d203d188b8fe60bb6578dd3152e05c md5sum = 6969398cd2fbc56a6af570b5273c56a9
configure-options = configure-options =
--with-gmp=${gmp:location} --with-gmp=${gmp:location}
--disable-static --disable-static
...@@ -42,8 +42,8 @@ environment = ...@@ -42,8 +42,8 @@ environment =
[gcc-common] [gcc-common]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/gcc/gcc-5.1.0/gcc-5.1.0.tar.bz2 url = http://ftp.gnu.org/gnu/gcc/gcc-5.2.0/gcc-5.2.0.tar.bz2
md5sum = d5525b1127d07d215960e6051c5da35e md5sum = a51bcfeb3da7dd4c623e27207ed43467
# make install does not work when several core are used # make install does not work when several core are used
make-targets = install -j1 make-targets = install -j1
......
...@@ -10,8 +10,8 @@ extends = ...@@ -10,8 +10,8 @@ extends =
[gettext] [gettext]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.4.tar.lz url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.5.1.tar.lz
md5sum = 3e2c6f64efbffd97520ec3b998682c6b md5sum = 153d3c541f4a1a284b365a8cd65875c9
configure-options = configure-options =
--disable-static --disable-static
......
...@@ -13,8 +13,8 @@ extends = ...@@ -13,8 +13,8 @@ extends =
[groonga] [groonga]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://packages.groonga.org/source/groonga/groonga-5.0.4.tar.gz url = http://packages.groonga.org/source/groonga/groonga-5.0.5.tar.gz
md5sum = 4c83e9b12e9fad96a5b51874ddf66dc4 md5sum = c119a73e4fcb3308d0ce6b955e1867b2
# temporary patch to respect more tokens in natural language mode. # temporary patch to respect more tokens in natural language mode.
patches = patches =
${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b ${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b
......
...@@ -11,8 +11,8 @@ parts = haproxy ...@@ -11,8 +11,8 @@ parts = haproxy
[haproxy] [haproxy]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.haproxy.org/download/1.5/src/haproxy-1.5.11.tar.gz url = http://www.haproxy.org/download/1.5/src/haproxy-1.5.14.tar.gz
md5sum = 5500a79d0d2b238d4a1e9749bd0c2cb2 md5sum = ad9d7262b96ba85a0f8c6acc6cb9edde
configure-command = true configure-command = true
# If the system is running on Linux 2.6, we use "linux26" as the TARGET, # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
# otherwise use "generic". # otherwise use "generic".
......
[buildout] [buildout]
extends = extends =
../m4/buildout.cfg
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
parts = libtool parts = libtool
...@@ -10,4 +11,5 @@ url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.5.tar.xz ...@@ -10,4 +11,5 @@ url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.5.tar.xz
configure-options = configure-options =
--disable-static --disable-static
environment = environment =
M4=${m4:location}/bin/m4
PATH=${xz-utils:location}/bin:%(PATH)s PATH=${xz-utils:location}/bin:%(PATH)s
...@@ -4,7 +4,7 @@ parts = ...@@ -4,7 +4,7 @@ parts =
[lunzip] [lunzip]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://download.savannah.gnu.org/releases/lzip/lunzip/lunzip-1.6.tar.gz url = http://download.savannah.gnu.org/releases-redirect/lzip/lunzip/lunzip-1.7.tar.gz
md5sum = 5e6ad4fe91f235be64227bc9930986fe md5sum = cb37bd46590a78bd19a77748b3a097ee
configure-options = configure-options =
--disable-static --disable-static
...@@ -57,8 +57,8 @@ environment = ...@@ -57,8 +57,8 @@ environment =
# mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users. # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
# http://mroonga.github.com/ # http://mroonga.github.com/
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://packages.groonga.org/source/mroonga/mroonga-5.03.tar.gz url = http://packages.groonga.org/source/mroonga/mroonga-5.04.tar.gz
md5sum = 4f5413d5c94ebc44caeeb5cb62d346ed md5sum = 5679e317050df819c0f812de49e27043
configure-command = mkdir fake_mariadb_source && ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql && ./configure configure-command = mkdir fake_mariadb_source && ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql && ./configure
configure-options = configure-options =
--prefix=${buildout:parts-directory}/${:_buildout_section_name_} --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
......
...@@ -4,6 +4,11 @@ parts = ...@@ -4,6 +4,11 @@ parts =
[openblas] [openblas]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
# OpenBLAS 0.2.13 and 0.2.14 does not build on Broadwell
# CPU (Detecting CPU failed). But version 0.2.15 (which
# does not exist yet) will fix the issue. Until then you
# can add in options :
# TARGET=HASWELL
url = http://github.com/xianyi/OpenBLAS/tarball/v0.2.13 url = http://github.com/xianyi/OpenBLAS/tarball/v0.2.13
md5sum = 74adf4c0d0d82bff4774be5bf2134183 md5sum = 74adf4c0d0d82bff4774be5bf2134183
configure-command = true configure-command = true
......
...@@ -16,13 +16,13 @@ parts = ...@@ -16,13 +16,13 @@ parts =
[openssl] [openssl]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://www.openssl.org/source/openssl-1.0.1n.tar.gz url = https://www.openssl.org/source/openssl-1.0.2d.tar.gz
md5sum = 139568bd5a56fa49b72a290d37113f30 md5sum = 38dd619b2e77cbac69b99f52a053d25a
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
patches = patches =
${:_profile_base_location_}/openssl-nodoc.patch#dd1345ae7ed18ccf176bc6b77c516f98 ${:_profile_base_location_}/openssl-nodoc.patch#a78c14908fe9ec624b1fb9fa97e01bb9
${:_profile_base_location_}/openssl-exlibs.patch#fba5c873cf974ba80a973be41da3c738 ${:_profile_base_location_}/openssl-exlibs.patch#fba5c873cf974ba80a973be41da3c738
${:_profile_base_location_}/openssl-1.0.1m-parallel-build.patch#a1ddd93b5b296473c7446131deb31f93 ${:_profile_base_location_}/openssl-1.0.2d-parallel-build.patch#e4cf66a48a85a0da68fd4842e6fab54b
patch-options = -p1 patch-options = -p1
configure-command = ./config configure-command = ./config
configure-options = configure-options =
......
https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/openssl/files/ diff -ur openssl-1.0.2d.orig/crypto/Makefile openssl-1.0.2d/crypto/Makefile
http://rt.openssl.org/Ticket/Display.html?id=2084 --- openssl-1.0.2d.orig/crypto/Makefile 2015-07-09 21:02:54.000000000 +0900
+++ openssl-1.0.2d/crypto/Makefile 2015-07-09 22:59:19.585880610 +0900
--- openssl-1.0.1m/crypto/Makefile
+++ openssl-1.0.1m/crypto/Makefile
@@ -85,11 +85,11 @@ @@ -85,11 +85,11 @@
@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
...@@ -11,7 +9,7 @@ http://rt.openssl.org/Ticket/Display.html?id=2084 ...@@ -11,7 +9,7 @@ http://rt.openssl.org/Ticket/Display.html?id=2084
+ +@target=all; $(RECURSIVE_MAKE) + +@target=all; $(RECURSIVE_MAKE)
files: files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
- @target=files; $(RECURSIVE_MAKE) - @target=files; $(RECURSIVE_MAKE)
+ +@target=files; $(RECURSIVE_MAKE) + +@target=files; $(RECURSIVE_MAKE)
...@@ -24,7 +22,7 @@ http://rt.openssl.org/Ticket/Display.html?id=2084 ...@@ -24,7 +22,7 @@ http://rt.openssl.org/Ticket/Display.html?id=2084
-$(LIB): $(LIBOBJ) -$(LIB): $(LIBOBJ)
+$(LIB): $(LIBOBJ) | subdirs +$(LIB): $(LIBOBJ) | subdirs
$(AR) $(LIB) $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ)
[ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
$(RANLIB) $(LIB) || echo Never mind. $(RANLIB) $(LIB) || echo Never mind.
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
fi fi
...@@ -44,25 +42,9 @@ http://rt.openssl.org/Ticket/Display.html?id=2084 ...@@ -44,25 +42,9 @@ http://rt.openssl.org/Ticket/Display.html?id=2084
lint: lint:
@target=lint; $(RECURSIVE_MAKE) @target=lint; $(RECURSIVE_MAKE)
--- openssl-1.0.1m/crypto/objects/Makefile diff -ur openssl-1.0.2d.orig/engines/Makefile openssl-1.0.2d/engines/Makefile
+++ openssl-1.0.1m/crypto/objects/Makefile --- openssl-1.0.2d.orig/engines/Makefile 2015-07-09 21:03:07.000000000 +0900
@@ -44,11 +44,11 @@ +++ openssl-1.0.2d/engines/Makefile 2015-07-09 22:59:19.585880610 +0900
# objects.pl both reads and writes obj_mac.num
obj_mac.h: objects.pl objects.txt obj_mac.num
$(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
- @sleep 1; touch obj_mac.h; sleep 1
-obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
+# This doesn't really need obj_mac.h, but since that rule reads & writes
+# obj_mac.num, we can't run in parallel with it.
+obj_xref.h: objxref.pl obj_xref.txt obj_mac.num obj_mac.h
$(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h
- @sleep 1; touch obj_xref.h; sleep 1
files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
--- openssl-1.0.1m/engines/Makefile
+++ openssl-1.0.1m/engines/Makefile
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
all: lib subdirs all: lib subdirs
...@@ -90,62 +72,39 @@ http://rt.openssl.org/Ticket/Display.html?id=2084 ...@@ -90,62 +72,39 @@ http://rt.openssl.org/Ticket/Display.html?id=2084
tags: tags:
ctags $(SRC) ctags $(SRC)
--- openssl-1.0.1m/Makefile.org diff -ur openssl-1.0.2d.orig/Makefile.org openssl-1.0.2d/Makefile.org
+++ openssl-1.0.1m/Makefile.org --- openssl-1.0.2d.orig/Makefile.org 2015-07-09 20:57:15.000000000 +0900
@@ -273,17 +273,17 @@ +++ openssl-1.0.2d/Makefile.org 2015-07-09 22:59:57.214057201 +0900
build_libs: build_crypto build_ssl build_engines @@ -278,21 +278,21 @@
build_libssl: build_ssl libssl.pc
build_crypto: build_crypto:
- @dir=crypto; target=all; $(BUILD_ONE_CMD) - @dir=crypto; target=all; $(BUILD_ONE_CMD)
-build_ssl:
- @dir=ssl; target=all; $(BUILD_ONE_CMD)
-build_engines:
- @dir=engines; target=all; $(BUILD_ONE_CMD)
-build_apps:
- @dir=apps; target=all; $(BUILD_ONE_CMD)
-build_tests:
- @dir=test; target=all; $(BUILD_ONE_CMD)
-build_tools:
- @dir=tools; target=all; $(BUILD_ONE_CMD)
+ +@dir=crypto; target=all; $(BUILD_ONE_CMD) + +@dir=crypto; target=all; $(BUILD_ONE_CMD)
+build_ssl: build_crypto build_ssl: build_crypto
- @dir=ssl; target=all; $(BUILD_ONE_CMD)
+ +@dir=ssl; target=all; $(BUILD_ONE_CMD) + +@dir=ssl; target=all; $(BUILD_ONE_CMD)
+build_engines: build_crypto build_engines: build_crypto
- @dir=engines; target=all; $(BUILD_ONE_CMD)
+ +@dir=engines; target=all; $(BUILD_ONE_CMD) + +@dir=engines; target=all; $(BUILD_ONE_CMD)
+build_apps: build_libs build_apps: build_libs
- @dir=apps; target=all; $(BUILD_ONE_CMD)
+ +@dir=apps; target=all; $(BUILD_ONE_CMD) + +@dir=apps; target=all; $(BUILD_ONE_CMD)
+build_tests: build_libs build_tests: build_libs
- @dir=test; target=all; $(BUILD_ONE_CMD)
+ +@dir=test; target=all; $(BUILD_ONE_CMD) + +@dir=test; target=all; $(BUILD_ONE_CMD)
+build_tools: build_libs build_tools: build_libs
- @dir=tools; target=all; $(BUILD_ONE_CMD)
+ +@dir=tools; target=all; $(BUILD_ONE_CMD) + +@dir=tools; target=all; $(BUILD_ONE_CMD)
all_testapps: build_libs build_testapps all_testapps: build_libs build_testapps
build_testapps: build_testapps:
@@ -538,9 +538,9 @@ - @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
dist_pem_h: + +@dir=crypto; target=testapps; $(BUILD_ONE_CMD)
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
fips_premain_dso$(EXE_EXT): libcrypto.a
-install: all install_docs install_sw [ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAG) -Iinclude \
+install: install_docs install_sw @@ -543,7 +543,7 @@
-install_sw:
+install_dirs:
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
@@ -549,12 +549,19 @@
$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
$(INSTALL_PREFIX)$(OPENSSLDIR)/private
+ @$(PERL) $(TOP)/util/mkdir-p.pl \
+ $(INSTALL_PREFIX)$(MANDIR)/man1 \
+ $(INSTALL_PREFIX)$(MANDIR)/man3 \
+ $(INSTALL_PREFIX)$(MANDIR)/man5 \
+ $(INSTALL_PREFIX)$(MANDIR)/man7
+
+install_sw: install_dirs
@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
do \
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
done; done;
...@@ -154,22 +113,9 @@ http://rt.openssl.org/Ticket/Display.html?id=2084 ...@@ -154,22 +113,9 @@ http://rt.openssl.org/Ticket/Display.html?id=2084
@set -e; liblist="$(LIBS)"; for i in $$liblist ;\ @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
do \ do \
if [ -f "$$i" ]; then \ if [ -f "$$i" ]; then \
@@ -634,12 +641,7 @@ diff -ur openssl-1.0.2d.orig/Makefile.shared openssl-1.0.2d/Makefile.shared
done; \ --- openssl-1.0.2d.orig/Makefile.shared 2015-07-09 20:53:21.000000000 +0900
done +++ openssl-1.0.2d/Makefile.shared 2015-07-09 22:59:19.589880628 +0900
-install_docs:
- @$(PERL) $(TOP)/util/mkdir-p.pl \
- $(INSTALL_PREFIX)$(MANDIR)/man1 \
- $(INSTALL_PREFIX)$(MANDIR)/man3 \
- $(INSTALL_PREFIX)$(MANDIR)/man5 \
- $(INSTALL_PREFIX)$(MANDIR)/man7
+install_docs: install_dirs
@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
here="`pwd`"; \
filecase=; \
--- openssl-1.0.1m/Makefile.shared
+++ openssl-1.0.1m/Makefile.shared
@@ -105,6 +105,7 @@ @@ -105,6 +105,7 @@
SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
...@@ -186,9 +132,10 @@ http://rt.openssl.org/Ticket/Display.html?id=2084 ...@@ -186,9 +132,10 @@ http://rt.openssl.org/Ticket/Display.html?id=2084
( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \ ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
fi; \ fi; \
--- openssl-1.0.1m/test/Makefile diff -ur openssl-1.0.2d.orig/test/Makefile openssl-1.0.2d/test/Makefile
+++ openssl-1.0.1m/test/Makefile --- openssl-1.0.2d.orig/test/Makefile 2015-07-09 21:03:09.000000000 +0900
@@ -130,7 +130,7 @@ +++ openssl-1.0.2d/test/Makefile 2015-07-09 22:59:19.589880628 +0900
@@ -134,7 +134,7 @@
tags: tags:
ctags $(SRC) ctags $(SRC)
...@@ -197,7 +144,7 @@ http://rt.openssl.org/Ticket/Display.html?id=2084 ...@@ -197,7 +144,7 @@ http://rt.openssl.org/Ticket/Display.html?id=2084
apps: apps:
@(cd ..; $(MAKE) DIRS=apps all) @(cd ..; $(MAKE) DIRS=apps all)
@@ -388,118 +388,118 @@ @@ -408,121 +408,121 @@
link_app.$${shlib_target} link_app.$${shlib_target}
$(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
...@@ -344,6 +291,10 @@ http://rt.openssl.org/Ticket/Display.html?id=2084 ...@@ -344,6 +291,10 @@ http://rt.openssl.org/Ticket/Display.html?id=2084
- @target=$(SRPTEST); $(BUILD_CMD) - @target=$(SRPTEST); $(BUILD_CMD)
+ +@target=$(SRPTEST); $(BUILD_CMD) + +@target=$(SRPTEST); $(BUILD_CMD)
$(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
- @target=$(V3NAMETEST); $(BUILD_CMD)
+ +@target=$(V3NAMETEST); $(BUILD_CMD)
$(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO) $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
- @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) - @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
+ +@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) + +@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
...@@ -352,9 +303,9 @@ http://rt.openssl.org/Ticket/Display.html?id=2084 ...@@ -352,9 +303,9 @@ http://rt.openssl.org/Ticket/Display.html?id=2084
- @target=$(CONSTTIMETEST) $(BUILD_CMD) - @target=$(CONSTTIMETEST) $(BUILD_CMD)
+ +@target=$(CONSTTIMETEST) $(BUILD_CMD) + +@target=$(CONSTTIMETEST) $(BUILD_CMD)
#$(AESTEST).o: $(AESTEST).c $(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o
# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c @target=$(VERIFYEXTRATEST) $(BUILD_CMD)
@@ -512,7 +512,7 @@ @@ -538,7 +538,7 @@
# fi # fi
dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
......
--- a/Makefile 2012-01-18 14:42:28.000000000 +0100 diff -ur openssl-1.0.2c.orig/Makefile openssl-1.0.2c/Makefile
+++ b/Makefile 2012-01-24 17:43:40.000000000 +0100 --- openssl-1.0.2c.orig/Makefile 2015-06-12 17:10:40.000000000 +0200
@@ -494,7 +494,7 @@ +++ openssl-1.0.2c/Makefile 2015-06-25 15:06:08.858209486 +0200
@@ -528,7 +528,7 @@
dist_pem_h: dist_pem_h:
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
......
...@@ -6,7 +6,7 @@ parts = ...@@ -6,7 +6,7 @@ parts =
[patch] [patch]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.gnu.org/gnu/patch/patch-2.7.3.tar.xz url = ftp://ftp.gnu.org/gnu/patch/patch-2.7.5.tar.xz
md5sum = 29b87be845e4662ab0ca0d48a805ecc6 md5sum = e3da7940431633fb65a01b91d3b7a27a
environment = environment =
PATH=${xz-utils:location}/bin:%(PATH)s PATH=${xz-utils:location}/bin:%(PATH)s
...@@ -4,8 +4,8 @@ parts = ...@@ -4,8 +4,8 @@ parts =
[pcre] [pcre]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.36.tar.bz2 url = http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.37.tar.bz2
md5sum = b767bc9af0c20bc9c1fe403b0d41ad97 md5sum = ed91be292cb01d21bc7e526816c26981
configure-options = configure-options =
--disable-static --disable-static
--enable-unicode-properties --enable-unicode-properties
...@@ -13,8 +13,8 @@ parts = ...@@ -13,8 +13,8 @@ parts =
[r-language] [r-language]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://cran.univ-paris1.fr/src/base/R-3/R-3.2.0.tar.gz url = http://cran.univ-paris1.fr/src/base/R-3/R-3.2.1.tar.gz
md5sum = 66fa17ad457d7e618191aa0f52fc402e md5sum = c2aac8b40f84e08e7f8c9068de9239a3
configure-options = configure-options =
--enable-R-shlib --enable-R-shlib
--with-readline=yes --with-readline=yes
......
...@@ -3,19 +3,47 @@ extends = ...@@ -3,19 +3,47 @@ extends =
../zlib/buildout.cfg ../zlib/buildout.cfg
../openssl/buildout.cfg ../openssl/buildout.cfg
../patch/buildout.cfg ../patch/buildout.cfg
../automake/buildout.cfg
../autoconf/buildout.cfg
../libtool/buildout.cfg
../git/buildout.cfg
parts = shellinabox parts = shellinabox
[shellinabox] [shellinabox]
<= shellinabox-2.10
[shellinabox-common]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://shellinabox.googlecode.com/files/shellinabox-2.10.tar.gz
md5sum = 0e144910d85d92edc54702ab9c46f032
environment = environment =
CFLAGS = -I${zlib:location}/include -I${openssl:location}/include CFLAGS = -I${zlib:location}/include -I${openssl:location}/include
LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
PKG_CONFIG_PATH = ${openssl:location}/lib/pkgconfig/ PKG_CONFIG_PATH = ${openssl:location}/lib/pkgconfig/
[shellinabox-2.10]
; This version is old, but we patch it for IPv6 support
<= shellinabox-common
url = http://shellinabox.googlecode.com/files/shellinabox-2.10.tar.gz
md5sum = 0e144910d85d92edc54702ab9c46f032
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
patch-options = -p1 patch-options = -p1
patches = patches =
${:_profile_base_location_}/0001-Switch-to-IPv6.patch#b61cb099c00e15a5fcaf6c98134fff45 ${:_profile_base_location_}/0001-Switch-to-IPv6.patch#b61cb099c00e15a5fcaf6c98134fff45
${:_profile_base_location_}/0002-Allow-to-run-entire-command-path.patch#a506b4d83021e24c830f767501c1d3fc ${:_profile_base_location_}/0002-Allow-to-run-entire-command-path.patch#a506b4d83021e24c830f767501c1d3fc
[shellinabox-git-repository]
; This version has much more features, but does not support IPv6 (support unix domain though)
recipe = slapos.recipe.build:gitclone
repository = https://github.com/shellinabox/shellinabox
revision = 458cd7aa8f513f41f7eee389fa5ff6a51acea593
git-executable = ${git:location}/bin/git
[shellinabox-github]
<= shellinabox-common
path = ${shellinabox-git-repository:location}
configure-command =
${libtool:location}/bin/libtoolize
${autoconf:location}/bin/autoreconf -vif
./configure
environment =
PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s
...@@ -33,7 +33,7 @@ configure-command = ...@@ -33,7 +33,7 @@ configure-command =
# tesseract has a non-standard way of testing for leptonica, hence the # tesseract has a non-standard way of testing for leptonica, hence the
# LIBLEPT_HEADERSDIR entry below: # LIBLEPT_HEADERSDIR entry below:
environment = environment =
PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s
ACLOCAL_ARGS=-I${libtool:location}/share/aclocal ACLOCAL_ARGS=-I${libtool:location}/share/aclocal
LIBLEPT_HEADERSDIR=${leptonica:location}/include LIBLEPT_HEADERSDIR=${leptonica:location}/include
CPPFLAGS=-I${leptonica:location}/include CPPFLAGS=-I${leptonica:location}/include
......
# Tig: text-mode interface for Git
# http://jonas.nitro.dk/tig/
[buildout]
extends =
../ncurses/buildout.cfg
[tig]
recipe = slapos.recipe.cmmi
url = http://jonas.nitro.dk/tig/releases/tig-2.1.tar.gz
md5sum = d6c237aba2c03d85897da79789fd6104
environment =
CFLAGS=-I${ncurses:location}/include
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
...@@ -20,8 +20,8 @@ parts = ...@@ -20,8 +20,8 @@ parts =
[trafficserver] [trafficserver]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://apache.claz.org/trafficserver/trafficserver-4.2.2.tar.bz2 url = http://apache.claz.org/trafficserver/trafficserver-4.2.3.tar.bz2
md5sum = e2249555837f4f7196d3189716b2828a md5sum = 1d06a6e9063ceea3f19dbb84752ec710
configure-options = configure-options =
--prefix=${buildout:parts-directory}/${:_buildout_section_name_} --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
--with-openssl=${openssl:location} --with-openssl=${openssl:location}
......
...@@ -78,7 +78,7 @@ mode = 0644 ...@@ -78,7 +78,7 @@ mode = 0644
[template-slave-list] [template-slave-list]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/templates/apache-custom-slave-list.cfg.in url = ${:_profile_base_location_}/templates/apache-custom-slave-list.cfg.in
md5sum = 588cbae0ac6fdb65ae97d1c90c8d53cf md5sum = f09759a0b68337d820c70e72afb4dbf9
mode = 640 mode = 640
[template-slave-configuration] [template-slave-configuration]
......
...@@ -129,6 +129,7 @@ value = {{ dumps(slave_instance.get(cert_name)) }} ...@@ -129,6 +129,7 @@ value = {{ dumps(slave_instance.get(cert_name)) }}
< = jinja2-template-base < = jinja2-template-base
template = {{ template_custom_slave_configuration }} template = {{ template_custom_slave_configuration }}
filename = {{ '%s.conf' % slave_reference }} filename = {{ '%s.conf' % slave_reference }}
rendered = {{ apache_configuration_directory }}/${:filename}
extra-context = extra-context =
key apache_custom_https {{ 'slave-instance-%s-configuration:apache_custom_https' % slave_reference }} key apache_custom_https {{ 'slave-instance-%s-configuration:apache_custom_https' % slave_reference }}
key apache_custom_http {{ 'slave-instance-%s-configuration:apache_custom_http' % slave_reference }} key apache_custom_http {{ 'slave-instance-%s-configuration:apache_custom_http' % slave_reference }}
...@@ -138,7 +139,7 @@ extra-context = ...@@ -138,7 +139,7 @@ extra-context =
# The slave use cache # The slave use cache
{% if 'enable_cache' in slave_instance and 'url' in slave_instance and 'domain' in slave_instance -%} {% if 'enable_cache' in slave_instance and 'url' in slave_instance and 'domain' in slave_instance -%}
{% do slave_instance.__setitem__('custom_domain', slapparameter_dict.get('domain')) -%} {% do slave_instance.__setitem__('custom_domain', slave_instance.get('domain')) -%}
{% do slave_instance.__setitem__('backend_url', slave_instance.get('url')) -%} {% do slave_instance.__setitem__('backend_url', slave_instance.get('url')) -%}
{% do cached_server_dict.__setitem__(slave_reference, slave_configuration_section_name) -%} {% do cached_server_dict.__setitem__(slave_reference, slave_configuration_section_name) -%}
{% endif -%} {% endif -%}
......
...@@ -57,20 +57,16 @@ ipython = 3.2.0 ...@@ -57,20 +57,16 @@ ipython = 3.2.0
matplotlib = 1.4.3 matplotlib = 1.4.3
mistune = 0.6 mistune = 0.6
nose = 1.3.7 nose = 1.3.7
numpy = 1.9.2
pandas = 0.16.2 pandas = 0.16.2
plone.recipe.command = 1.1 plone.recipe.command = 1.1
pyzmq = 14.7.0 pyzmq = 14.7.0
scikit-learn = 0.16.1 scikit-learn = 0.16.1
scipy = 0.15.1 scipy = 0.15.1
simpy = 3.0.7 slapos.recipe.template = 2.8
slapos.recipe.template = 2.7
terminado = 0.5 terminado = 0.5
tornado = 4.2 tornado = 4.2
# Required by:
# dream==0.0.1
MySQL-python = 1.2.5
# Required by: # Required by:
# tornado==4.2 # tornado==4.2
backports.ssl-match-hostname = 3.4.0.2 backports.ssl-match-hostname = 3.4.0.2
...@@ -80,46 +76,18 @@ backports.ssl-match-hostname = 3.4.0.2 ...@@ -80,46 +76,18 @@ backports.ssl-match-hostname = 3.4.0.2
certifi = 2015.4.28 certifi = 2015.4.28
# Required by: # Required by:
# matplotlib==1.4.3 # mock==1.1.3
mock = 1.0.1 funcsigs = 0.4
# Required by: # Required by:
# dream==0.0.1 # matplotlib==1.4.3
numpy = 1.9.2 mock = 1.1.3
# Required by: # Required by:
# terminado==0.5 # terminado==0.5
ptyprocess = 0.5 ptyprocess = 0.5
# Required by:
# dream==0.0.1
pydot = 1.0.28
# Required by: # Required by:
# matplotlib==1.4.3 # matplotlib==1.4.3
# pandas==0.16.1 # pandas==0.16.2
python-dateutil = 2.4.2 python-dateutil = 2.4.2
# Required by:
# dream==0.0.1
rpy2 = 2.6.0
# Required by:
# rpy2==2.6.0
singledispatch = 3.4.0.3
# Required by:
# dream==0.0.1
tablib = 0.10.0
# Required by:
# dream==0.0.1
xlrd = 0.9.3
# Required by:
# dream==0.0.1
xlwt = 1.0.0
# Required by:
# dream==0.0.1
zope.dottedname = 4.1.0
...@@ -33,23 +33,6 @@ to be accessible from IPv4. ...@@ -33,23 +33,6 @@ to be accessible from IPv4.
See the instance-kvm-input-schema.json file for more instance parameters (cpu-count, ram-size, disk-size, etc). See the instance-kvm-input-schema.json file for more instance parameters (cpu-count, ram-size, disk-size, etc).
KVM instance (1GB of RAM, 10GB of SSD, one core)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Note that the KVM instance will try to request a frontend slave instance in order
to be accessible from IPv4.
::
myawesomekvm = request(
software_release=kvm,
partition_reference="My awesome KVM",
partition_parameter_kw={
"nbd-host":"ubuntu-1204.nbd.vifib.net",
}
)
See the instance-kvm-input-schema.json file for more instance parameters (cpu-count, ram-size, disk-size, etc).
Resilient KVM instance Resilient KVM instance
~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
......
...@@ -147,7 +147,6 @@ As you can see in instance-runner-*.cfg, the buildout section extends a hard-cod ...@@ -147,7 +147,6 @@ As you can see in instance-runner-*.cfg, the buildout section extends a hard-cod
List of ports used by the webrunner: List of ports used by the webrunner:
------------------------------------ ------------------------------------
8602 : slapproxy, while running tests 8602 : slapproxy, while running tests
8949 : shellinabox
9684 : apache (monitoring of slaprunner, git access) 9684 : apache (monitoring of slaprunner, git access)
22222 : dropbear 22222 : dropbear
39986 : supervisord 39986 : supervisord
...@@ -156,4 +155,4 @@ List of ports used by the webrunner: ...@@ -156,4 +155,4 @@ List of ports used by the webrunner:
Tips: Tips:
----- -----
You can use shellinabox in fullscreen, by accessing : https://[IPV6]:8949 You can use shellinabox in fullscreen, by accessing : https://[IPV6]:50005/shellinabox/
- resilient sr: Cloned instances should not launch slapgrid-sr if it was not launched on export instance - resilient sr: Cloned instances should not launch slapgrid-sr if it was not launched on export instance
- shellinabox password should be the same in all the resilient instances
- add test for parameter auto-deploy-instance - add test for parameter auto-deploy-instance
- Add download facility in file browser - Add download facility in file browser
...@@ -7,6 +7,7 @@ extends = ...@@ -7,6 +7,7 @@ extends =
../../component/dcron/buildout.cfg ../../component/dcron/buildout.cfg
../../component/dropbear/buildout.cfg ../../component/dropbear/buildout.cfg
../../component/git/buildout.cfg ../../component/git/buildout.cfg
../../component/tig/buildout.cfg
../../component/logrotate/buildout.cfg ../../component/logrotate/buildout.cfg
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
../../component/nano/buildout.cfg ../../component/nano/buildout.cfg
...@@ -34,6 +35,10 @@ parts = ...@@ -34,6 +35,10 @@ parts =
rdiff-backup rdiff-backup
collective.recipe.template-egg collective.recipe.template-egg
# Use shellinabox from github with AF_UNIX support
[shellinabox]
<= shellinabox-github
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
...@@ -45,7 +50,7 @@ mode = 0644 ...@@ -45,7 +50,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in output = ${buildout:directory}/template-runner.cfg.in
md5sum = 67fd0af225c6c4f93f539f82dd23a2db md5sum = 6d6ab000fbb9a208a98e9b68d971c571
mode = 0644 mode = 0644
[template-runner-import-script] [template-runner-import-script]
...@@ -97,7 +102,7 @@ mode = 0644 ...@@ -97,7 +102,7 @@ mode = 0644
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/nginx_conf.in url = ${:_profile_base_location_}/nginx_conf.in
download-only = true download-only = true
md5sum = 7c0608eafb5c6998846851744a70b3de md5sum = fac41d8819c17ebca78e4554932b1075
filename = nginx_conf.in filename = nginx_conf.in
mode = 0644 mode = 0644
...@@ -120,7 +125,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} ...@@ -120,7 +125,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[template-slapos-cfg] [template-slapos-cfg]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename} url = ${:_profile_base_location_}/template/${:filename}
md5sum = c490563b831fc959a09b4b233263a6c6 md5sum = f406b91c5b0261b198a1c1930c195071
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = slapos.cfg.in filename = slapos.cfg.in
download-only = true download-only = true
...@@ -138,7 +143,7 @@ mode = 0644 ...@@ -138,7 +143,7 @@ mode = 0644
[template-bash-profile] [template-bash-profile]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename} url = ${:_profile_base_location_}/template/${:filename}
md5sum = 39dc910743c70d5120a778779a052cad md5sum = 1c88cbca0c1e705eeb4b544ef4616097
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = bash_profile.in filename = bash_profile.in
download-only = true download-only = true
...@@ -147,7 +152,7 @@ mode = 0644 ...@@ -147,7 +152,7 @@ mode = 0644
[template-supervisord] [template-supervisord]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename} url = ${:_profile_base_location_}/template/${:filename}
md5sum = 239fe88e1522afe7686572dd34568720 md5sum = 069e593e50204b227bdb08d29d7292fd
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = supervisord.conf.in filename = supervisord.conf.in
download-only = true download-only = true
......
...@@ -3,18 +3,16 @@ ...@@ -3,18 +3,16 @@
# slapos.toolbox from git repository instead of fetching stable version, # slapos.toolbox from git repository instead of fetching stable version,
# allowing to play with bleeding edge environment. # allowing to play with bleeding edge environment.
# You'll need to run buildout twice for this profile.
[buildout] [buildout]
extends = common.cfg extends = common.cfg
parts = parts =
# Development eggs # Development eggs
slapos.toolbox-repository slapos.toolbox-dev
slapos.cookbook-repository slapos.cookbook-dev
slapos.core-repository slapos.core-dev
check-recipe check-recipe
# erp5.util-repository # erp5.util-dev
# Good elements # Good elements
template template
eggs eggs
...@@ -26,25 +24,29 @@ parts = ...@@ -26,25 +24,29 @@ parts =
rdiff-backup rdiff-backup
collective.recipe.template-egg collective.recipe.template-egg
develop =
${:parts-directory}/slapos.toolbox-repository
${:parts-directory}/slapos.cookbook-repository
${:parts-directory}/slapos.core-repository
# ${:parts-directory}/erp5.util-repository
[slapos.toolbox-repository] [slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.toolbox.git repository = https://lab.nexedi.cn/nexedi/slapos.toolbox.git
branch = slaprunner-paas branch = slaprunner-paas
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
develop = true
[slapos.toolbox-dev]
recipe = zc.recipe.egg:develop
egg = slapos.toolbox
setup = ${slapos.toolbox-repository:location}
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = http://git.erp5.org/repos/slapos.git
branch = slaprunner-paas branch = slaprunner-paas
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
develop = true
[slapos.cookbook-dev]
recipe = zc.recipe.egg:develop
egg = slapos.cookbook
setup = ${slapos.cookbook-repository:location}
# Used for resiliency tests only # Used for resiliency tests only
[erp5.util-repository] [erp5.util-repository]
...@@ -52,22 +54,24 @@ recipe = slapos.recipe.build:gitclone ...@@ -52,22 +54,24 @@ recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/erp5.git repository = http://git.erp5.org/repos/erp5.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
develop = true
[erp5.util-dev]
recipe = zc.recipe.egg:develop
egg = erp5.util
setup = ${erp5.util-repository:location}
[slapos.core-repository] [slapos.core-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.core.git repository = https://lab.nexedi.cn/nexedi/slapos.core.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
develop = true
[check-recipe] [slapos.core-dev]
recipe = plone.recipe.command recipe = zc.recipe.egg:develop
stop-on-error = true egg = slapos.core
update-command = ${:command} setup = ${slapos.core-repository:location}
command =
grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link &&
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
grep parts ${buildout:develop-eggs-directory}/slapos.core.egg-link
# grep parts ${buildout:develop-eggs-directory}/erp5.util.egg-link
[versions] [versions]
slapos.cookbook = slapos.cookbook =
......
...@@ -84,6 +84,13 @@ ...@@ -84,6 +84,13 @@
"type": "string", "type": "string",
"format": "uri" "format": "uri"
}, },
"check-custom-frontend-promise": {
"title": "Check Custom Frontend Promise",
"description": "Enable a promise to check that HTTP frontend created from custom-frontend-backend-url is available",
"type": "string",
"enum": ["true", "false"],
"default": "false"
},
"monitor-port": { "monitor-port": {
"title": "Monitor Port", "title": "Monitor Port",
"description": "Allow to manually change the port on wich the apache server running monitoring interface is listening. The default value for the webrunner is different from the default value of the standalone stack-monitor server (default 9684)", "description": "Allow to manually change the port on wich the apache server running monitoring interface is listening. The default value for the webrunner is different from the default value of the standalone stack-monitor server (default 9684)",
...@@ -102,6 +109,10 @@ ...@@ -102,6 +109,10 @@
"description": "Number of clones to be deployed when a resilient runner, if missing a single clone is provided. Its value can be 1 or 2", "description": "Number of clones to be deployed when a resilient runner, if missing a single clone is provided. Its value can be 1 or 2",
"type": "integer", "type": "integer",
"enum": [1, 2] "enum": [1, 2]
} },
"instance-name": {
"description": "Name of the instance, to show in the window title",
"type": "string"
},
} }
} }
...@@ -4,19 +4,17 @@ parts = ...@@ -4,19 +4,17 @@ parts =
nginx-launcher nginx-launcher
certificate-authority certificate-authority
ca-nginx ca-nginx
ca-shellinabox
gunicorn-launcher gunicorn-launcher
gunicorn-graceful gunicorn-graceful
sshkeys-dropbear-runner sshkeys-dropbear-runner
dropbear-server-add-authorized-key dropbear-server-add-authorized-key
sshkeys-authority sshkeys-authority
publish-connection-informations publish-connection-information
slaprunner-promise slaprunner-promise
slaprunner-frontend-promise slaprunner-frontend-promise
slaprunner-supervisord-wrapper slaprunner-supervisord-wrapper
dropbear-promise dropbear-promise
runtestsuite runtestsuite
shellinabox-promise
symlinks symlinks
shellinabox shellinabox
slapos-cfg slapos-cfg
...@@ -29,7 +27,7 @@ parts = ...@@ -29,7 +27,7 @@ parts =
bash-profile bash-profile
supervisord-wrapper supervisord-wrapper
supervisord-promise supervisord-promise
{% if slapparameter_dict.get('custom-frontend-backend-url') %} {% if slapparameter_dict.get('custom-frontend-backend-url') and slapparameter_dict.get('check-custom-frontend-promise', 'false') == 'true' %}
custom-frontend-promise custom-frontend-promise
{% endif %} {% endif %}
## Monitoring part ## Monitoring part
...@@ -62,11 +60,6 @@ develop-eggs-directory = ${buildout:develop-eggs-directory} ...@@ -62,11 +60,6 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true offline = true
{% if slapparameter_dict.get('custom-frontend-backend-url') -%} {% if slapparameter_dict.get('custom-frontend-backend-url') -%}
# Requests, if defined, a frontend to allow access to a server
# located inside of the virtual machine listening to port X
# to LAN IPv4.
# Internaly, the frontend will be asked to listen on the IPv6
# with port X + 10000, to match NAT rules of Qemu.
[request-custom-frontend] [request-custom-frontend]
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
software-url = {{ slapparameter_dict.get('custom-frontend-software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg') }} software-url = {{ slapparameter_dict.get('custom-frontend-software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg') }}
...@@ -101,7 +94,7 @@ check-secure = 1 ...@@ -101,7 +94,7 @@ check-secure = 1
dash_path = {{ dash_executable_location }} dash_path = {{ dash_executable_location }}
curl_path = {{ curl_executable_location }} curl_path = {{ curl_executable_location }}
[publish-connection-informations] [publish-connection-information]
custom-frontend-url = https://$${request-custom-frontend:connection-domain} custom-frontend-url = https://$${request-custom-frontend:connection-domain}
{% endif %} {% endif %}
...@@ -192,6 +185,7 @@ minishell_history_file = $${directory:etc}/.minishell_history ...@@ -192,6 +185,7 @@ minishell_history_file = $${directory:etc}/.minishell_history
software_info_json = $${runnerdirectory:home}/software_info.json software_info_json = $${runnerdirectory:home}/software_info.json
instance_info_json = $${runnerdirectory:home}/instance_info.json instance_info_json = $${runnerdirectory:home}/instance_info.json
path = $${shell:path} path = $${shell:path}
instance_name = $${slap-parameter:instance-name}
#--------------------------- #---------------------------
...@@ -274,7 +268,7 @@ scgi_temp_path = $${directory:tmp}/scgi_temp_path ...@@ -274,7 +268,7 @@ scgi_temp_path = $${directory:tmp}/scgi_temp_path
[nginx-frontend] [nginx-frontend]
# Options # Options
nb_workers = 2 nb_workers = 5
# Network # Network
local-ip = $${slap-network-information:local-ipv4} local-ip = $${slap-network-information:local-ipv4}
global-ip = $${slap-network-information:global-ipv6} global-ip = $${slap-network-information:global-ipv6}
...@@ -308,7 +302,7 @@ recipe = slapos.recipe.template:jinja2 ...@@ -308,7 +302,7 @@ recipe = slapos.recipe.template:jinja2
template = ${template_nginx_conf:location}/${template_nginx_conf:filename} template = ${template_nginx_conf:location}/${template_nginx_conf:filename}
rendered = $${nginx-frontend:path_nginx_conf} rendered = $${nginx-frontend:path_nginx_conf}
context = context =
key shellinabox_port shellinabox:port key shellinabox_socket shellinabox:socket
key socket gunicorn:socket key socket gunicorn:socket
section param_nginx_frontend nginx-frontend section param_nginx_frontend nginx-frontend
section param_tempdir tempdirectory section param_tempdir tempdirectory
...@@ -414,13 +408,6 @@ wrapper = $${directory:services}/nginx-frontend ...@@ -414,13 +408,6 @@ wrapper = $${directory:services}/nginx-frontend
# Put domain name # Put domain name
name = example.com name = example.com
[ca-shellinabox]
<= certificate-authority
recipe = slapos.cookbook:certificate_authority.request
executable = $${shellinabox:wrapper}
wrapper = $${directory:services}/shellinaboxd
key-file = $${cadirectory:certs}/shellinabox.key
cert-file = $${cadirectory:certs}/shellinabox.crt
#-------------------- #--------------------
#-- #--
#-- Request frontend #-- Request frontend
...@@ -449,9 +436,9 @@ return = site_url domain ...@@ -449,9 +436,9 @@ return = site_url domain
#-------------------------------------- #--------------------------------------
#-- #--
#-- Send informations to SlapOS Master #-- Send information to SlapOS Master
[publish-connection-informations] [publish-connection-information]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
1_info = On your first run, Use "access_url" to setup you account. Then you can use both "url" or "access_url". Or "backend_url" if you want to use ipv6. Set up your account in the webrunner in order to use webdav, and being able to clone your git repositories from the runner. 1_info = On your first run, Use "access_url" to setup you account. Then you can use both "url" or "access_url". Or "backend_url" if you want to use ipv6. Set up your account in the webrunner in order to use webdav, and being able to clone your git repositories from the runner.
2_info = In order to set up your account, get the recovery-code from the monitoring interface. Before read the notification on monitor_info. 2_info = In order to set up your account, get the recovery-code from the monitoring interface. Before read the notification on monitor_info.
...@@ -490,12 +477,6 @@ path = $${directory:promises}/dropbear ...@@ -490,12 +477,6 @@ path = $${directory:promises}/dropbear
hostname = $${dropbear-runner-server:host} hostname = $${dropbear-runner-server:host}
port = $${dropbear-runner-server:port} port = $${dropbear-runner-server:port}
[shellinabox-promise]
recipe = slapos.cookbook:check_port_listening
path = $${directory:promises}/shellinabox
hostname = $${shellinabox:ipv6}
port = $${shellinabox:port}
[symlinks] [symlinks]
recipe = cns.recipe.symlink recipe = cns.recipe.symlink
symlink_target = $${directory:bin} symlink_target = $${directory:bin}
...@@ -516,6 +497,7 @@ auto-deploy = false ...@@ -516,6 +497,7 @@ auto-deploy = false
auto-deploy-instance = true auto-deploy-instance = true
autorun = false autorun = false
monitor-port = 9684 monitor-port = 9684
instance-name =
[monitor-parameters] [monitor-parameters]
port = $${slap-parameter:monitor-port} port = $${slap-parameter:monitor-port}
...@@ -537,30 +519,25 @@ context = ...@@ -537,30 +519,25 @@ context =
section slaprunner test-runner section slaprunner test-runner
[shellinabox] [shellinabox]
recipe = slapos.cookbook:shellinabox recipe = slapos.recipe.template:jinja2
ipv6 = $${slap-network-information:global-ipv6} # We cannot use slapos.cookbook:wrapper here because this recipe escapes too much
port = 8949 socket = $${directory:run}/siab.sock
shell = $${shell:wrapper} mode = 0700
wrapper = $${directory:bin}/shellinaboxd rendered = $${directory:services}/shellinaboxd
shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd template = inline:
password = $${zero-parameters:shell-password} #!/bin/sh
directory = $${runnerdirectory:home} exec ${shellinabox:location}/bin/shellinaboxd \
login-shell = $${directory:bin}/login --disable-ssl \
certificate-directory = $${cadirectory:certs} --disable-ssl-menu \
cert-file = $${ca-shellinabox:cert-file} --unixdomain-only=$${:socket}:$(id -u):$(id -g):0600 \
key-file = $${ca-shellinabox:key-file} --service "/:$(id -u):$(id -g):HOME:$${shell:wrapper} -l"
[shellinabox-code]
recipe = slapos.cookbook:generate.password
storage-path = $${directory:etc}/.scode
bytes = 8
[shell] [shell]
recipe = slapos.cookbook:shell recipe = slapos.cookbook:shell
wrapper = $${directory:bin}/sh wrapper = $${directory:bin}/bash
shell = ${bash:location}/bin/bash shell = ${bash:location}/bin/bash
home = $${runnerdirectory:home} home = $${buildout:directory}
path = $${environ:PATH}:${nano:location}/bin:${vim:location}/bin:${screen:location}/bin:${git:location}/bin path = $${environ:PATH}:/usr/bin:/bin/:${nano:location}/bin:${vim:location}/bin:${screen:location}/bin:${git:location}/bin:${tig:location}/bin
ps1 = "\\w> " ps1 = "\\w> "
[environ] [environ]
...@@ -622,7 +599,6 @@ key = $${slap-connection:key-file} ...@@ -622,7 +599,6 @@ key = $${slap-connection:key-file}
cert = $${slap-connection:cert-file} cert = $${slap-connection:cert-file}
[public] [public]
shell-password = $${shellinabox-code:passwd}
recovery-code = $${recovery-code:passwd} recovery-code = $${recovery-code:passwd}
[zero-parameters] [zero-parameters]
...@@ -639,7 +615,7 @@ recipe = slapos.recipe.template:jinja2 ...@@ -639,7 +615,7 @@ recipe = slapos.recipe.template:jinja2
template = ${template-bash-profile:location}/${template-bash-profile:filename} template = ${template-bash-profile:location}/${template-bash-profile:filename}
rendered = $${buildout:directory}/.bash_profile rendered = $${buildout:directory}/.bash_profile
context = context =
raw path $PATH:${nano:location}/bin:${vim:location}/bin:${screen:location}/bin:${git:location}/bin:${curl:location}/bin:${python2.7:location}/bin raw path $PATH:${nano:location}/bin:${vim:location}/bin:${screen:location}/bin:${git:location}/bin:${curl:location}/bin:${python2.7:location}/bin:${tig:location}/bin
key workdir runnerdirectory:home key workdir runnerdirectory:home
...@@ -655,7 +631,7 @@ exitcodes = 0 ...@@ -655,7 +631,7 @@ exitcodes = 0
logfile = $${directory:log}/supervisord.log logfile = $${directory:log}/supervisord.log
no_logfile = NONE no_logfile = NONE
numprocs = 1 numprocs = 1
path = $${environ:PATH} path = $${shell:path}
pidfile = $${directory:run}/supervisord.pid pidfile = $${directory:run}/supervisord.pid
server = $${slaprunner:ipv4}:$${:port} server = $${slaprunner:ipv4}:$${:port}
port = 39986 port = 39986
......
...@@ -6,8 +6,8 @@ error_log {{ param_nginx_frontend['path_error_log'] }}; ...@@ -6,8 +6,8 @@ error_log {{ param_nginx_frontend['path_error_log'] }};
daemon off; daemon off;
events { events {
worker_connections 1024; worker_connections 1024;
accept_mutex off; accept_mutex off;
} }
http { http {
...@@ -18,6 +18,7 @@ http { ...@@ -18,6 +18,7 @@ http {
default upgrade; default upgrade;
'' close; '' close;
} }
server { server {
listen [{{ param_nginx_frontend['global-ip'] }}]:{{ param_nginx_frontend['global-port'] }} ssl; listen [{{ param_nginx_frontend['global-ip'] }}]:{{ param_nginx_frontend['global-port'] }} ssl;
server_name _; server_name _;
...@@ -31,8 +32,12 @@ http { ...@@ -31,8 +32,12 @@ http {
fastcgi_temp_path {{ param_tempdir['fastcgi_temp_path'] }}; fastcgi_temp_path {{ param_tempdir['fastcgi_temp_path'] }};
uwsgi_temp_path {{ param_tempdir['uwsgi_temp_path'] }}; uwsgi_temp_path {{ param_tempdir['uwsgi_temp_path'] }};
scgi_temp_path {{ param_tempdir['scgi_temp_path'] }}; scgi_temp_path {{ param_tempdir['scgi_temp_path'] }};
error_page 401 /login;
location / { location / {
# When no .htpasswd exist, redirect the user to account creation page
if ( !-f {{ param_nginx_frontend['etc_dir'] }}/.htpasswd ) {
return 301 /setAccount ;
}
auth_basic "Restricted"; auth_basic "Restricted";
auth_basic_user_file {{ param_nginx_frontend['etc_dir'] }}/.htpasswd; auth_basic_user_file {{ param_nginx_frontend['etc_dir'] }}/.htpasswd;
proxy_redirect off; proxy_redirect off;
...@@ -52,18 +57,17 @@ http { ...@@ -52,18 +57,17 @@ http {
proxy_pass http://unix:{{ socket }}; proxy_pass http://unix:{{ socket }};
} }
location /shellinabox { location /shellinabox {
proxy_pass http://[{{ param_nginx_frontend['global-ip'] }}]:{{ shellinabox_port }}/; proxy_pass http://unix:{{ shellinabox_socket }}:/;
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
auth_basic "Restricted"; auth_basic "Restricted";
auth_basic_user_file {{ param_nginx_frontend['etc_dir'] }}/.htpasswd; auth_basic_user_file {{ param_nginx_frontend['etc_dir'] }}/.htpasswd;
proxy_redirect off; proxy_redirect off;
proxy_buffering off; proxy_buffering off;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Host $http_host; proxy_set_header X-Forwarded-Host $http_host;
} }
} }
} }
...@@ -21,16 +21,16 @@ plone.recipe.command = 1.1 ...@@ -21,16 +21,16 @@ plone.recipe.command = 1.1
pycrypto = 2.6.1 pycrypto = 2.6.1
slapos.recipe.download = 1.0.dev-r4053 slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.7 slapos.recipe.template = 2.7
slapos.toolbox = 0.48 slapos.toolbox = 0.50
smmap = 0.9.0 smmap = 0.9.0
z3c.recipe.scripts = 1.0.1 z3c.recipe.scripts = 1.0.1
# Required by: # Required by:
# slapos.toolbox==0.48 # slapos.toolbox==0.50
GitPython = 1.0.1 GitPython = 0.3.5
# Required by: # Required by:
# slapos.toolbox==0.48 # slapos.toolbox==0.50
atomize = 0.2.0 atomize = 0.2.0
# Required by: # Required by:
...@@ -38,17 +38,17 @@ atomize = 0.2.0 ...@@ -38,17 +38,17 @@ atomize = 0.2.0
backports.ssl-match-hostname = 3.4.0.2 backports.ssl-match-hostname = 3.4.0.2
# Required by: # Required by:
# slapos.toolbox==0.48 # slapos.toolbox==0.50
feedparser = 5.2.0.post1 feedparser = 5.1.3
# Required by: # Required by:
# slapos.toolbox==0.48 # slapos.toolbox==0.50
lockfile = 0.10.2 lockfile = 0.10.2
# Required by: # Required by:
# slapos.toolbox==0.48 # slapos.toolbox==0.50
paramiko = 1.15.2 paramiko = 1.15.2
# Required by: # Required by:
# slapos.toolbox==0.48 # slapos.toolbox==0.50
rpdb = 0.1.5 rpdb = 0.1.5
...@@ -4,5 +4,38 @@ ...@@ -4,5 +4,38 @@
cd {{ workdir }} cd {{ workdir }}
export PATH={{- path }} export PATH={{- path }}
export PS1="\w $ " export PS1="$ "
export LANG="en_GB.UTF-8"
if [ -f "$HOME/.bashrc" ] ; then
source $HOME/.bashrc
fi
# If not running interactively, don't do anything
case $- in
*i*) ;;
*) return;;
esac
# enable color support
if [ -x /usr/bin/dircolors ]; then
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
alias ls='ls --color=auto'
fi
# some more ls aliases
alias ll='ls -l'
alias la='ls -A'
alias l='ls -CF'
echo "Welcome to SlapOS slaprunner shell"
echo
# TODO: how to run slapos ?
#echo "You can use the following slapos CLI commands:"
#echo "slapos node software"
#echo "slapos node instance"
#echo "slapos request"
#echo ""
# XXX for now we can use:
#echo ~/bin/supervisorctl -c ~/etc/supervisorctl.conf
#echo ~/bin/supervisorctl -c ~/srv/runner/instance/etc/supervisorctl.conf
...@@ -36,6 +36,7 @@ knowledge0_cfg = {{ slaprunner['knowledge0_file'] }} ...@@ -36,6 +36,7 @@ knowledge0_cfg = {{ slaprunner['knowledge0_file'] }}
minishell_cwd_file = {{ slaprunner['minishell_cwd_file'] }} minishell_cwd_file = {{ slaprunner['minishell_cwd_file'] }}
minishell_history_file = {{ slaprunner['minishell_history_file'] }} minishell_history_file = {{ slaprunner['minishell_history_file'] }}
path = {{ slaprunner['path'] }} path = {{ slaprunner['path'] }}
instance_name = {{ slaprunner['instance_name'] }}
[slapproxy] [slapproxy]
host = {{ slaprunner['ipv4'] }} host = {{ slaprunner['ipv4'] }}
......
...@@ -26,7 +26,7 @@ autorestart = {{ supervisord['autorestart'] }} ...@@ -26,7 +26,7 @@ autorestart = {{ supervisord['autorestart'] }}
stdout_logfile = {{ supervisord['no_logfile'] }} stdout_logfile = {{ supervisord['no_logfile'] }}
stderr_logfile = {{ supervisord['no_logfile'] }} stderr_logfile = {{ supervisord['no_logfile'] }}
directory = {{ supervisord['directory'] }} directory = {{ supervisord['directory'] }}
environment = PATH="{{- supervisord['path'] -}}",MAKEFLAGS="-j{{- '%d' % builtin.max(1, (multiprocessing.cpu_count() / builtin.int(slapparameter_dict.get('cpu-usage-ration', 4)))) -}}" environment = PATH="{{- supervisord['path'] -}}",MAKEFLAGS="-j{{- '%d' % builtin.max(1, (multiprocessing.cpu_count() / builtin.int(slapparameter_dict.get('cpu-usage-ratio', 4)))) -}}"
[program:{{- supervisord['slapgrid-cp'] -}}] [program:{{- supervisord['slapgrid-cp'] -}}]
command = {{ supervisord['slapgrid-cp-command'] }} command = {{ supervisord['slapgrid-cp-command'] }}
......
...@@ -552,6 +552,7 @@ cloudooo = 1.2.5-dev ...@@ -552,6 +552,7 @@ cloudooo = 1.2.5-dev
PasteDeploy = 1.5.2 PasteDeploy = 1.5.2
Pygments = 2.0.2 Pygments = 2.0.2
coverage = 3.7.1 coverage = 3.7.1
zope.dottedname = 4.1.0
# test_UserManagerInterfaces in testERP5Security fails with 1.10.0. # test_UserManagerInterfaces in testERP5Security fails with 1.10.0.
Products.PluggableAuthService = 1.9.0 Products.PluggableAuthService = 1.9.0
...@@ -587,16 +588,16 @@ zope.app.testing = 3.8.1 ...@@ -587,16 +588,16 @@ zope.app.testing = 3.8.1
# Pinned versions # Pinned versions
MySQL-python = 1.2.5 MySQL-python = 1.2.5
Pillow = 2.8.2 Pillow = 2.9.0
Products.CMFActionIcons = 2.1.3 Products.CMFActionIcons = 2.1.3
Products.DCWorkflowGraph = 0.4.1 Products.DCWorkflowGraph = 0.4.1
Products.ExternalEditor = 1.1.0 Products.ExternalEditor = 1.1.0
Products.GenericSetup = 1.7.5 Products.GenericSetup = 1.7.6
Products.LongRequestLogger = 1.1.0 Products.LongRequestLogger = 1.1.0
Products.MimetypesRegistry = 2.0.7 Products.MimetypesRegistry = 2.0.8
Products.PluginRegistry = 1.3 Products.PluginRegistry = 1.3
Products.TIDStorage = 5.4.9 Products.TIDStorage = 5.4.9
PyPDF2 = 1.24 PyPDF2 = 1.25
PyXML = 0.8.5 PyXML = 0.8.5
Pympler = 0.4.1 Pympler = 0.4.1
StructuredText = 2.11.1 StructuredText = 2.11.1
...@@ -613,31 +614,31 @@ eventlet = 0.17.4 ...@@ -613,31 +614,31 @@ eventlet = 0.17.4
five.formlib = 1.0.4 five.formlib = 1.0.4
five.localsitemanager = 2.0.5 five.localsitemanager = 2.0.5
gitdb = 0.6.4 gitdb = 0.6.4
greenlet = 0.4.6 greenlet = 0.4.7
http-parser = 0.8.3 http-parser = 0.8.3
httplib2 = 0.9.1 httplib2 = 0.9.1
huBarcode = 1.0.0 huBarcode = 1.0.0
interval = 1.0.0 interval = 1.0.0
ipdb = 0.8.1 ipdb = 0.8.1
ipython = 3.2.0 ipython = 3.2.0
logilab-common = 0.63.2 logilab-common = 1.0.2
numpy = 1.9.2 numpy = 1.9.2
plone.recipe.command = 1.1 plone.recipe.command = 1.1
ply = 3.6 ply = 3.6
polib = 1.0.6 polib = 1.0.7
pprofile = 1.7.3 pprofile = 1.7.3
pycountry = 1.12 pycountry = 1.13
pycrypto = 2.6.1 pycrypto = 2.6.1
pyflakes = 0.9.2 pyflakes = 0.9.2
pylint = 1.4.3 pylint = 1.4.4
python-ldap = 2.4.19 python-ldap = 2.4.20
python-magic = 0.4.6 python-magic = 0.4.6
python-memcached = 1.54 python-memcached = 1.54
qrcode = 5.1 qrcode = 5.1
restkit = 4.2.2 restkit = 4.2.2
rtjp-eventlet = 0.3.2 rtjp-eventlet = 0.3.2
slapos.recipe.template = 2.7 slapos.recipe.template = 2.8
slapos.toolbox = 0.48 slapos.toolbox = 0.49
smmap = 0.9.0 smmap = 0.9.0
socketpool = 0.5.3 socketpool = 0.5.3
spyne = 2.11.0 spyne = 2.11.0
...@@ -650,7 +651,7 @@ validictory = 1.0.0 ...@@ -650,7 +651,7 @@ validictory = 1.0.0
xupdate-processor = 0.4 xupdate-processor = 0.4
# Required by: # Required by:
# slapos.toolbox==0.48 # slapos.toolbox==0.49
GitPython = 1.0.1 GitPython = 1.0.1
# Required by: # Required by:
...@@ -658,7 +659,7 @@ GitPython = 1.0.1 ...@@ -658,7 +659,7 @@ GitPython = 1.0.1
Products.ZSQLMethods = 2.13.4 Products.ZSQLMethods = 2.13.4
# Required by: # Required by:
# slapos.toolbox==0.48 # slapos.toolbox==0.49
atomize = 0.2.0 atomize = 0.2.0
# Required by: # Required by:
...@@ -666,7 +667,7 @@ atomize = 0.2.0 ...@@ -666,7 +667,7 @@ atomize = 0.2.0
backports.ssl-match-hostname = 3.4.0.2 backports.ssl-match-hostname = 3.4.0.2
# Required by: # Required by:
# slapos.toolbox==0.48 # slapos.toolbox==0.49
feedparser = 5.2.0.post1 feedparser = 5.2.0.post1
# Required by: # Required by:
...@@ -674,15 +675,15 @@ feedparser = 5.2.0.post1 ...@@ -674,15 +675,15 @@ feedparser = 5.2.0.post1
fpconst = 0.7.2 fpconst = 0.7.2
# Required by: # Required by:
# slapos.toolbox==0.48 # slapos.toolbox==0.49
lockfile = 0.10.2 lockfile = 0.10.2
# Required by: # Required by:
# slapos.toolbox==0.48 # slapos.toolbox==0.49
paramiko = 1.15.2 paramiko = 1.15.2
# Required by: # Required by:
# slapos.toolbox==0.48 # slapos.toolbox==0.49
rpdb = 0.1.5 rpdb = 0.1.5
# Required by: # Required by:
......
...@@ -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.post9 zc.buildout = 1.7.1.post10
# 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.post4 zc.recipe.egg = 1.3.2.post4
# 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,22 +116,22 @@ buildout-versions = 1.7 ...@@ -116,22 +116,22 @@ buildout-versions = 1.7
cffi = 1.1.2 cffi = 1.1.2
cmd2 = 0.6.8 cmd2 = 0.6.8
collective.recipe.template = 1.11 collective.recipe.template = 1.11
cryptography = 0.9.1 cryptography = 0.9.3
inotifyx = 0.2.2 inotifyx = 0.2.2
itsdangerous = 0.24 itsdangerous = 0.24
lxml = 3.4.4 lxml = 3.4.4
meld3 = 1.0.2 meld3 = 1.0.2
mr.developer = 1.33 mr.developer = 1.33
netaddr = 0.7.14 netaddr = 0.7.15
pbr = 1.2.0 pbr = 1.3.0
prettytable = 0.7.2 prettytable = 0.7.2
psutil = 3.0.1 psutil = 3.1.1
pyOpenSSL = 0.15.1 pyOpenSSL = 0.15.1
pyparsing = 2.0.3 pyparsing = 2.0.3
pytz = 2015.4 pytz = 2015.4
requests = 2.7.0 requests = 2.7.0
setuptools = 16.0 setuptools = 18.0.1
simplejson = 3.7.3 simplejson = 3.8.0
six = 1.9.0 six = 1.9.0
slapos.cookbook = 0.102 slapos.cookbook = 0.102
slapos.core = 1.3.10 slapos.core = 1.3.10
...@@ -139,7 +139,7 @@ slapos.extension.strip = 0.1 ...@@ -139,7 +139,7 @@ slapos.extension.strip = 0.1
slapos.libnetworkcache = 0.14.2 slapos.libnetworkcache = 0.14.2
slapos.recipe.build = 0.21 slapos.recipe.build = 0.21
slapos.recipe.cmmi = 0.2 slapos.recipe.cmmi = 0.2
stevedore = 1.5.0 stevedore = 1.6.0
xml-marshaller = 0.9.7 xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1 z3c.recipe.scripts = 1.0.1
...@@ -149,7 +149,7 @@ Flask = 0.10.1 ...@@ -149,7 +149,7 @@ Flask = 0.10.1
# Required by: # Required by:
# cliff==1.13.0 # cliff==1.13.0
# stevedore==1.5.0 # stevedore==1.6.0
argparse = 1.3.0 argparse = 1.3.0
# Required by: # Required by:
...@@ -157,20 +157,20 @@ argparse = 1.3.0 ...@@ -157,20 +157,20 @@ argparse = 1.3.0
cliff = 1.13.0 cliff = 1.13.0
# Required by: # Required by:
# cryptography==0.9.1 # cryptography==0.9.3
enum34 = 1.0.4 enum34 = 1.0.4
# Required by: # Required by:
# jsonschema==2.5.1 # jsonschema==2.5.1
functools32 = 3.2.3.post1 functools32 = 3.2.3.post2
# Required by: # Required by:
# cryptography==0.9.1 # cryptography==0.9.3
idna = 2.0 idna = 2.0
# Required by: # Required by:
# cryptography==0.9.1 # cryptography==0.9.3
ipaddress = 1.0.7 ipaddress = 1.0.14
# Required by: # Required by:
# slapos.cookbook==0.102 # slapos.cookbook==0.102
...@@ -185,7 +185,7 @@ lock-file = 2.0 ...@@ -185,7 +185,7 @@ lock-file = 2.0
netifaces = 0.10.4 netifaces = 0.10.4
# Required by: # Required by:
# cryptography==0.9.1 # cryptography==0.9.3
pyasn1 = 0.1.8 pyasn1 = 0.1.8
# Required by: # Required by:
...@@ -212,14 +212,10 @@ download-dir-url = http://www.shacache.org/shadir ...@@ -212,14 +212,10 @@ download-dir-url = http://www.shacache.org/shadir
# Romain Courteaud # Romain Courteaud
# Sebastien Robin # Sebastien Robin
# Kazuhiko Shiozaki # Kazuhiko Shiozaki
# Cedric de Saint Martin
# Yingjie Xu
# Gabriel Monnerat # Gabriel Monnerat
# Łukasz Nowak
# Test Agent (Automatic update from tests) # Test Agent (Automatic update from tests)
# Aurélien Calonne # Aurélien Calonne
# Rafael Monnerat # Rafael Monnerat
# Antoine Catton
signature-certificate-list = signature-certificate-list =
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
...@@ -261,32 +257,6 @@ signature-certificate-list = ...@@ -261,32 +257,6 @@ signature-certificate-list =
vaZhjNYKWQf79l6zXfOvphzJ vaZhjNYKWQf79l6zXfOvphzJ
-----END CERTIFICATE----- -----END CERTIFICATE-----
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
...@@ -300,19 +270,6 @@ signature-certificate-list = ...@@ -300,19 +270,6 @@ signature-certificate-list =
yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI= yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-----END CERTIFICATE----- -----END CERTIFICATE-----
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
...@@ -351,16 +308,3 @@ signature-certificate-list = ...@@ -351,16 +308,3 @@ signature-certificate-list =
j8LgKB3tZCbBj+HDj+AeD+q9V+cqMFLKc6LezvQYUuum6bZdfUNnPv1K1ULYSPjq j8LgKB3tZCbBj+HDj+AeD+q9V+cqMFLKc6LezvQYUuum6bZdfUNnPv1K1ULYSPjq
/jsRBbabCWSXqxR6gYEM6ooauj3udBMXhHE= /jsRBbabCWSXqxR6gYEM6ooauj3udBMXhHE=
-----END CERTIFICATE----- -----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-----END CERTIFICATE-----
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