Merge branch 'master' of https://lab.nexedi.com/nexedi/slapos

component/ca-certificates/buildout.cfg

@@ -11,9 +11,9 @@ parts =
 
 [ca-certificates]
 recipe = slapos.recipe.cmmi
-url = http://http.debian.net/debian/pool/main/c/ca-certificates/ca-certificates_20160104.tar.xz
+url = http://http.debian.net/debian/pool/main/c/ca-certificates/ca-certificates_20161102.tar.xz
 patch-binary = ${patch:location}/bin/patch
-md5sum = d9665a83d0d3ef8176a38e6aa20458e9
+md5sum = 74642bd9b9e0a449fa55e6632070745f
 patches =
   ${:_profile_base_location_}/ca-certificates-any-python.patch#087b5e860c7a4b8ff6656c95c5835ee2
   ${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b

software/build-rina/build.cfg

@@ -109,9 +109,6 @@ install =
   extends = /mnt/slapos/software/hellorina/software.cfg
   develop = /mnt/slapos
   download-cache = /mnt/download-cache
-  # Required for recent buildout.
-  extensions -=
-    buildout-versions
   [slapos-cookbook-develop]
   recipe =
   setup =
@@ -121,10 +118,8 @@ install =
   [versions]
   slapos.cookbook =
   EOF
-  :||{ # https://github.com/pypa/setuptools/pull/846
   python -S /mnt/buildout/bin/buildout bootstrap
   MAKEFLAGS=-j${:smp} bin/buildout
-  }
 
   arch=`dpkg-architecture -qDEB_HOST_ARCH`
   sudo sh -c "/mnt/slapos.package/playbook/roles/rina/gen-ipcm-conf

software/build-rina/software.cfg

@@ -77,8 +77,10 @@ packages +=
   git ca-certificates python
 # biggest and common build-deps for RINA
   dh-autoreconf pkg-config doxygen maven xmlto
+# hellorina (shouldn't parts like lxml-python depend on the python of the SR?)
+  python-dev
 
 [versions]
-setuptools = 28.8.0
+setuptools = 30.1.0
 zc.buildout = 2.5.2+slapos005
 zc.recipe.egg = 2.0.3+slapos002

software/hellorina/software.cfg

@@ -6,6 +6,10 @@ parts =
     slapos-cookbook
     template
 
+# Required for recent buildout.
+extensions -=
+  buildout-versions
+
 [template]
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg.in
@@ -40,3 +44,8 @@ recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_buildout_section_name_}
 mode = 755
 md5sum = 78b77a6bda9958f547f7d89b747731e3
+
+[versions]
+setuptools = 30.1.0
+zc.buildout = 2.5.2+slapos005
+zc.recipe.egg = 2.0.3+slapos002

software/neoppod/software-common.cfg

@@ -17,7 +17,7 @@ extends =
     ../../component/pycurl/buildout.cfg
 
 parts =
-# keep neoppod first so that ZODB3 is built correctly,
+# keep neoppod first so that ZODB is built correctly,
 # before any other section that would depend on it
     neoppod-develop
     neoppod
@@ -40,9 +40,12 @@ environment = neoppod-setup-env
 
 [neoppod]
 recipe = zc.recipe.egg
-eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb, tests]
+eggs = neoppod[admin, ctl, master, storage-mysqldb]
   ${python-mysqlclient:egg}
-  ZODB3
+  psutil
+  BTrees
+  ZODB
+  zope.testing
 
 [slapos-deps-eggs]
 recipe = zc.recipe.egg
@@ -102,7 +105,12 @@ md5sum = 81ab5e842ecf8385b12d735585497cc8
 
 [versions]
 slapos.recipe.template = 2.9
-ZODB3 = 3.10.7
+ZODB = 4.4.4
+BTrees = 4.3.1
+persistent = 4.2.2
+transaction = 1.7.0
+zdaemon = 4.1.0
+zodbpickle = 0.6.0
 # Required by slapos.toolbox = 0.61
 slapos.toolbox = 0.61
 PyRSS2Gen = 1.1

software/neoppod/software-zodb3.cfg

+[buildout]
+extends = software.cfg
+
+[neoppod]
+eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb, tests]
+  ${python-mysqlclient:egg}
+  ZODB3
+patch-binary = ${patch:location}/bin/patch
+ZODB3-patch-options = -p1
+ZODB3-patches =
+  ${neoppod-repository:location}/ZODB3.patch
+
+[versions]
+ZODB3 = 3.10.7+SlapOSPatched001
+transaction = 1.1.1
+zdaemon = 2.0.7

software/neoppod/software-zodb4.cfg

-[buildout]
-extends = software.cfg
-
-[neoppod]
-eggs = neoppod
-  ${python-mysqlclient:egg}
-  psutil
-  ZODB
-  zope.testing
-
-[versions]
-ZODB = 4.4.4
-transaction = 1.7.0
-zdaemon =

software/neoppod/software.cfg

@@ -33,19 +33,12 @@ recipe = zc.recipe.egg
 eggs = erp5.util
 interpreter = ${:_buildout_section_name_}
 
-[neoppod]
-patch-binary = ${patch:location}/bin/patch
-ZODB3-patch-options = -p1
-ZODB3-patches +=
-  ${neoppod-repository:location}/ZODB3.patch
-
 [versions]
-ZODB3 = 3.10.7+SlapOSPatched001
 erp5.util = 0.4.46
 # To match ERP5
-transaction = 1.1.1
 ZConfig = 2.9.3
 zc.lockfile = 1.0.2
-zdaemon = 2.0.7
 zope.event = 3.5.2
+zope.exceptions = 3.6.2
+zope.testing = 3.9.7
 ##

stack/erp5/buildout.cfg

@@ -466,10 +466,9 @@ initialization =
 
 [eggs]
 <= neoppod
-eggs =
+eggs = ${neoppod:eggs}
   ${numpy:egg}
   ${matplotlib:egg}
-  ${python-mysqlclient:egg}
   ${lxml-python:egg}
   ${pandas:egg}
   ${pillow-python:egg}
@@ -524,9 +523,7 @@ eggs =
   pylint
   pytracemalloc
 
-  neoppod[client]
 # Zope
-  ZODB3
   Zope2
 # Zope acquisition patch
   Acquisition
@@ -683,6 +680,8 @@ PyXML = 0.8.5
 Pympler = 0.4.3
 StructuredText = 2.11.1
 WSGIUtils = 0.7
+ZEO = 4.2.1
+ZODB3 = 3.11.0
 Zope2 = 2.13.24
 astor = 0.5
 # astroid 1.4.1 breaks testDynamicClassGeneration

stack/monitor/buildout.cfg

@@ -96,7 +96,7 @@ recipe = slapos.recipe.template:jinja2
 filename = template-monitor.cfg
 template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
 rendered = ${buildout:directory}/template-monitor.cfg
-md5sum = 266f23bc836a938ac69ce0bc674f34fe
+md5sum = 870ff63cde9cc0f50fd7ad4b727bdf8c
 context =
     key apache_location apache:location
     key gzip_location gzip:location

stack/monitor/instance-monitor.cfg.jinja2.in

@@ -293,7 +293,7 @@ wrapper-path = ${directory:bin}/monitor-globalstate
 [monitor-configurator-wrapper]
 recipe = slapos.cookbook:wrapper
 # XXX - hard coded path
-command-line = {{ monitor_configwrite }} --config_folder '${monitor-conf-parameters:private-folder}/config/.jio_documents' --output_cfg_file '${monitor-instance-parameter:configuration-file-path}' --htpasswd_bin '{{ apache_location }}/bin/htpasswd'
+command-line = {{ monitor_configwrite }} --config_folder '${monitor-conf-parameters:private-folder}/config/.jio_documents' --output_cfg_file '${monitor-instance-parameter:configuration-file-path}' --htpasswd_bin '{{ apache_location }}/bin/htpasswd' --monitor_https_cors {{ monitor_https_cors }}
 wrapper-path = ${directory:bin}/monitor-configurator
 
 [monitor-globalstate-cron-entry]