Update Release Candidate

component/apache-php/buildout.cfg

@@ -58,8 +58,11 @@ environment =
   PATH=${autoconf:location}/bin:${automake:location}/bin:${m4:location}/bin:${apache-php:location}/bin:%(PATH)s
 
 
+[apache]
+# apache-php will write in apache folder, so we cannot share apache if apache-php is used.
+shared = false
+
 [apache-php]
-# Note: Shall react on each build of apache and reinstall itself
 recipe = slapos.recipe.cmmi
 url = https://www.php.net/distributions/php-7.3.6.tar.bz2
 md5sum = bde9a912fb311182cd460dad1abbc247

component/apache/buildout.cfg

@@ -18,32 +18,30 @@ extends =
   ../zlib/buildout.cfg
   ./buildout.hash.cfg
 
+
 [apr]
-recipe = slapos.recipe.build:download-unpacked
-shared = false
-strip-top-level-dir = false
+recipe = slapos.recipe.cmmi
+shared = true
 version = 1.5.2
 md5sum = 4e9769f3349fe11fc0a5e1b224c236aa
 url = https://archive.apache.org/dist/apr/apr-${:version}.tar.bz2
 
 [apr-util]
-recipe = slapos.recipe.build:download-unpacked
-shared = false
-strip-top-level-dir = false
+recipe = slapos.recipe.cmmi
+shared = true
 version = 1.5.4
 url = https://archive.apache.org/dist/apr/apr-util-${:version}.tar.bz2
 md5sum = 2202b18f269ad606d70e1864857ed93c
+configure-options =
+    --with-apr=${apr:location}
+    --with-expat=${libexpat:location}
 
 [apache]
-# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
-shared = false
+shared = true
 version = 2.4.43
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
 md5sum = 791c986b1e70fe61eb44060aacc89a64
-pre-configure =
-  cp -ar ${apr:location}/apr-${apr:version} srclib/apr/ &&
-  cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util
 configure-options = --disable-static
                     --enable-authn-alias
                     --enable-bucketeer
@@ -74,7 +72,6 @@ configure-options = --disable-static
                     --enable-so
                     --enable-ssl
                     --disable-lua
-                    --with-included-apr
                     --with-ssl=${openssl:location}
                     --with-z=${zlib:location}
                     --with-expat=${libexpat:location}
@@ -94,15 +91,19 @@ configure-options = --disable-static
                     --without-freedts
                     --without-odbc
                     --without-iconv
+                    --with-apr=${apr:location}
+                    --with-apr-util=${apr-util:location}
 
 environment =
   PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  CPPFLAGS =-I${libuuid:location}/include -I${openssl:location}/include
-  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
+  CPPFLAGS =-I${libuuid:location}/include -I${openssl:location}/include -I${apr:location}/include -I${apr-util:location}/include
+  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib -L${apr:location}/lib -Wl,-rpath=${apr:location}/lib -L${apr-util:location}/lib -Wl,-rpath=${apr-util:location}/lib -L${libexpat:location}/lib -Wl,-rpath=${libexpat:location}/lib
 
 [apache-antiloris]
-# Note: Shall react on each build of apache and reinstall itself
+# Note: This component tries to write in a [apache] parts, which is now
+# shared. To use this component in a software, apache parts have to be made
+# not shared in the software.
 recipe = slapos.recipe.cmmi
 shared = false
 url = http://downloads.sourceforge.net/project/mod-antiloris/mod_antiloris-0.4.tar.bz2
@@ -122,6 +123,6 @@ environment =
 
 [template-apache-backend-conf]
 recipe = slapos.recipe.build:download
-shared = false
+shared = true
 url = ${:_profile_base_location_}/${:filename}
 mode = 640

component/aspell/aspell-create-wrapper.py

+import os
+import textwrap
+import glob
+
+
+def post_make_hook(options, buildout, environment):
+  prefix = options['prefix']
+  dict_dir = options['dict-dir']
+  aspell_bin = os.path.join(
+      buildout['aspell']['location'],
+      'bin',
+      'aspell')
+
+  aspell_bin_wrapper = options['bin-aspell']
+
+  bin_folder = os.path.dirname(aspell_bin_wrapper)
+  if not os.path.isdir(bin_folder):
+    os.mkdir(bin_folder)
+
+  # install a ./bin/aspell set to use the dict from this part
+  with open(aspell_bin_wrapper, 'w') as wrapper:
+    wrapper.write('''#!/bin/sh
+export ASPELL_CONF="dict-dir {dict_dir}"
+exec {aspell_bin} "$@"
+'''.format(**locals()))
+  os.chmod(aspell_bin_wrapper, 0o755)

component/aspell/buildout.cfg

 [buildout]
 parts =
   aspell
-  aspell-en-dictonary
+  aspell-en-dictionary
 
 extends =
   ../ncurses/buildout.cfg
   ../patch/buildout.cfg
   ../perl/buildout.cfg
+  buildout.hash.cfg
+
 
 [aspell-dictionary-common]
+# Macro to install an aspell dictionnary and create an aspell wrapper using
+# this dictionnary.
+# The aspell wrapper is exported as ${:bin-aspell}
+bin-aspell = @@LOCATION@@/bin/aspell
+
 recipe = slapos.recipe.cmmi
-shared = false
+shared = true
 configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin
+dict-dir = @@LOCATION@@/lib/aspell/
+data-dir = @@LOCATION@@/lib/aspell/
+make-options =
+  dictdir=${:dict-dir}
+  datadir=${:data-dir}
+make-targets = install
+post-make-hook = ${:_profile_base_location_}/${aspell-create-wrapper:filename}#${aspell-create-wrapper:md5sum}:post_make_hook
+
 
 [aspell]
 recipe = slapos.recipe.cmmi
-shared = false
+shared = true
 url = https://ftp.gnu.org/gnu/aspell/aspell-0.60.7.tar.gz
 md5sum = 8ef2252609c511cd2bb26f3a3932ef28
 environment =

component/aspell/buildout.hash.cfg

+[aspell-create-wrapper]
+filename = aspell-create-wrapper.py
+md5sum = 5b7cc325032f8588870fd2c6b8bd1b6d

component/cpio/buildout.cfg

@@ -4,5 +4,6 @@ parts = cpio
 
 [cpio]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.bz2
 md5sum = 93eea9f07c0058c097891c73e4955456

component/firefox/buildout.cfg

@@ -110,9 +110,6 @@ slapos_promise =
 x86 = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 ${:i686-md5sum}
 x86-64 = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 ${:x86_64-md5sum}
 
-fonts =
-  ${liberation-fonts:location}
-  ${ipaex-fonts:location}
 library =
   ${alsa:location}/lib
   ${atk:location}/lib

component/fontconfig/buildout.cfg

 [buildout]
 extends =
-  ../fonts/buildout.cfg
   ../freetype/buildout.cfg
   ../libxml2/buildout.cfg
   ../pkgconfig/buildout.cfg
@@ -8,12 +7,14 @@ extends =
   ../zlib/buildout.cfg
   ../bzip2/buildout.cfg
   ../gperf/buildout.cfg
+  buildout.hash.cfg
 
 parts =
   fontconfig
 
 [fontconfig]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://fontconfig.org/release/fontconfig-2.12.6.tar.bz2
 md5sum = 733f5e2371ca77b69707bd7b30cc2163
 pkg_config_depends = ${freetype:pkg_config_depends}:${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig
@@ -21,10 +22,15 @@ configure-options =
   --disable-static
   --disable-docs
   --enable-libxml2
-  --with-default-fonts=${fonts:location}
   --with-add-fonts=no
 environment =
   PATH=${pkgconfig:location}/bin:${gperf:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CPPFLAGS=-I${zlib:location}/include -I${bzip2:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib
+
+[template-fonts-conf]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:parts-directory}/${:_buildout_section_name_}
+mode = 640

component/fontconfig/buildout.hash.cfg

+[template-fonts-conf]
+filename = fonts.conf.in
+md5sum = 6967e553630d107fc0a59b14de8b0251
+

component/fontconfig/fonts.conf.in

+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+{#
+ # Generates a fonts.conf to be used as FONTCONFIG_FILE environment variable.
+ #
+ # This template needs the following keys in context:
+ #
+ #  - cachedir: a directory to use a cachedir
+ #  - fonts: directories containing fonts ( \n separated list of paths )
+ #             for example {liberation-fonts:location}
+ #  - includes: directories fontconfig configuration ( \n separated list of paths )
+ #             typically, applications want to include {fontconfig:location}/etc/fonts/conf.d
+ #             also some fonts packages bundles font.d
+ #}
+<fontconfig>
+  <cachedir>{{ cachedir | escape}}</cachedir>
+  {% for font in fonts.splitlines() -%}
+    <dir>{{ font | escape}}</dir>
+  {% endfor %}
+  {% for include in includes.splitlines() -%}
+    <include>{{ include | escape}}</include>
+  {% endfor %}
+</fontconfig>
\ No newline at end of file

component/fonts/buildout.cfg

@@ -4,21 +4,27 @@ extends =
   ../p7zip/buildout.cfg
 
 parts =
-  liberation-fonts
-  ipaex-fonts
-  ipa-fonts
-  ocrb-fonts
   android-fonts
   dejavu-fonts
+  ipa-fonts
+  ipaex-fonts
+  liberation-fonts
+  ocrb-fonts
 
-[fonts]
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [fonts-base]
-destination = ${fonts:location}/${:_buildout_section_name_}
-location = ${:destination}
-recipe = slapos.recipe.build:download-unpacked
-strip-top-level-dir = true
+# XXX download and unpack, with shared parts support
+# we could make slapos.recipe.build:download-unpacked really support shared
+# parts and use it here. Current version of slapos.recipe.build ( 0.44 ) looks
+# for buildout:shared-parts , but this is not what shared parts are using.
+recipe = slapos.recipe.cmmi
+shared = true
+configure-command = :
+make-binary = :
+post-install = cp -ra . ${:location}
+location = @@LOCATION@@
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
 
 # Liberation(tm) Fonts - a font family which aims at metric
 # compatibility with Arial, Times New Roman, and Courier New.
@@ -61,7 +67,7 @@ md5sum = d0efec10b9f110a32e9b8f796e21782c
 # Microsoft's TrueType core fonts
 # non-free so not enabled by default
 [msttcore-fonts]
-location = ${fonts:location}/${:_buildout_section_name_}
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
 recipe = slapos.recipe.build
 install =
   import os, subprocess

component/ghostscript/buildout.cfg

@@ -11,6 +11,7 @@ parts = ghostscript
 
 [ghostscript-common]
 recipe = slapos.recipe.cmmi
+shared = true
 pkg_config_depends = ${libtiff:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}
 configure-options =
   --disable-cups

component/graphviz/buildout.cfg

@@ -13,6 +13,7 @@ extends =
 
 [graphviz]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://ftp.osuosl.org/pub/blfs/conglomeration/graphviz/graphviz-2.40.1.tar.gz
 md5sum = 4ea6fd64603536406166600bcc296fc8
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}

component/groonga/buildout.cfg

@@ -14,9 +14,10 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
-shared = false
+shared = true
 url = https://packages.groonga.org/source/groonga/groonga-9.1.2.tar.gz
 md5sum = 5266c49b758dde744854cb8cfe025812
+groonga-plugin-dir =  @@LOCATION@@/lib/groonga/plugins/
 # temporary patch to respect more tokens in natural language mode.
 patches =
   ${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b
@@ -43,12 +44,16 @@ environment =
   LDFLAGS=-Wl,-rpath=${jemalloc:location}/lib -L${jemalloc:location}/lib -Wl,-rpath=${libstemmer:location}/lib -L${libstemmer:location}/lib -Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
   PATH=${patch:location}/bin:%(PATH)s
 
+
 [groonga-normalizer-mysql]
 recipe = slapos.recipe.cmmi
-shared = false
+shared = true
 url = https://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.4.tar.gz
 md5sum = effa67fb271d49810850a3b275d040f6
-location = ${groonga:location}
+
+groonga-plugin-dir =  @@LOCATION@@/lib/groonga/plugins/
+pre-configure = mkdir -p ${:groonga-plugin-dir}
+make-targets = GROONGA_PLUGINS_DIR=${:groonga-plugin-dir} install
 configure-options =
   --disable-static
 environment =

component/gtk-2/buildout.cfg

@@ -25,6 +25,7 @@ parts =
 
 [cairo]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://cairographics.org/releases/cairo-1.16.0.tar.xz
 md5sum = f19e0353828269c22bd72e271243a552
 pkg_config_depends = ${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${glib:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${libpng:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig
@@ -46,6 +47,7 @@ environment =
 
 [harfbuzz]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.6.4.tar.xz
 md5sum = 2b3a4dfdb3e5e50055f941978944da9f
 pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}:${icu4c:location}/lib/pkgconfig
@@ -71,6 +73,7 @@ configure-options =
 
 [pango]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://download.gnome.org/sources/pango/1.42/pango-1.42.4.tar.xz
 md5sum = deb171a31a3ad76342d5195a1b5bbc7c
 pkg_config_depends = ${fribidi:location}/lib/pkgconfig:${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}
@@ -116,6 +119,7 @@ environment =
 
 [gtk-2]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.32.tar.xz
 md5sum = d5742aa42275203a499b59b4c382a784
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig

component/gtkmm/buildout.cfg

@@ -15,6 +15,7 @@ parts =
 
 [cairomm]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://cairographics.org/releases/cairomm-1.13.1.tar.gz
 md5sum = 21fe892652741b7544f52da6965d27fc
 pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}:${libsigc:location}/lib/pkgconfig
@@ -29,6 +30,7 @@ environment =
 
 [pangomm]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/pangomm-2.40.1.tar.xz
 md5sum = 874eadd9434613dbacf0272c82c3ac23
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${glibmm:location}/lib/pkgconfig:${glibmm:pkg_config_depends}:${cairomm:location}/lib/pkgconfig
@@ -42,6 +44,7 @@ environment =
 
 [atkmm]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/atkmm-2.24.2.tar.xz
 md5sum = d53b60b0f1be597e86070954a49cf0c3
 pkg_config_depends = ${atk:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
@@ -55,6 +58,7 @@ environment =
 
 [gtkmm]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.24/gtkmm-2.24.5.tar.xz
 md5sum = 6c59ae8bbff48fad9132f23af347acf1
 pkg_config_depends = ${pangomm:location}/lib/pkgconfig:${pangomm:pkg_config_depends}:${atkmm:location}/lib/pkgconfig:${atkmm:pkg_config_depends}:${gtk-2:location}/lib/pkgconfig:${gtk-2:pkg_config_depends}

component/imagemagick/buildout.cfg

@@ -25,6 +25,7 @@ extends =
 
 [imagemagick]
 recipe = slapos.recipe.cmmi
+shared = true
 version = 7.0.2-10
 url = https://www.imagemagick.org/download/releases/ImageMagick-${:version}.tar.xz
 md5sum = e1cb23d9c10a8eff228ef30ee281711a

component/inkscape/buildout.cfg

@@ -26,6 +26,7 @@ extends =
 
 [gsl]
 recipe = slapos.recipe.cmmi
+shared = true
 url = ftp://ftp.gnu.org/gnu/gsl/gsl-2.6.tar.gz
 md5sum = bda73a3dd5ff2f30b5956764399db6e7
 configure-options =
@@ -37,6 +38,7 @@ environment =
 
 [inkscape]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://inkscape.org/gallery/item/13330/inkscape-0.92.4_A6N0YOn.tar.bz2
 md5sum = ac30f6d5747fd9c620c00dad500f414f
 location = @@LOCATION@@

component/librsvg/buildout.cfg

@@ -22,6 +22,7 @@ environment =
 
 [librsvg]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/librsvg-2.40.16.tar.xz
 md5sum = f474fe37177a2bf8050787df2046095c
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${zlib:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig

component/mariadb/buildout.cfg

@@ -28,10 +28,11 @@ parts =
 
 [mariadb]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve
 version = 10.4.12
 md5sum = 97d7c0f508c04a31c138fdb24e95dbc4
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = @@LOCATION@@
 pre-configure =
   set '\bSET(PLUGIN_AUTH_PAM YES)' cmake/build_configurations/mysql_release.cmake
   grep -q "$@"
@@ -85,8 +86,12 @@ post-install =
 
 [mroonga-mariadb]
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
-# http://mroonga.github.com/
+# https://mroonga.org/
+#
+# To use mroonga, configure mariadb instance to use ${mroonga-mariadb:plugin-dir}
+# as plugin-dir ( https://mariadb.com/kb/en/server-system-variables/#plugin_dir )
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://packages.groonga.org/source/mroonga/mroonga-9.12.tar.gz
 md5sum = d0af673f1bad3b9ccf33870bb2344a25
 pre-configure = 
@@ -95,13 +100,19 @@ pre-configure =
   cd fake_mariadb_source
   ln -s ${mariadb:location}/wsrep-lib
   cp -a ${mariadb:location}/include/mysql/server include
-  mv include/private sql
+  cp -a include/private sql
+  chmod -R a+w include sql # so that buildout can delete this compile-dir after install
+  mkdir -p ${:plugin-dir}
 configure-options =
   --with-mysql-source=fake_mariadb_source
   --with-mysql-config=${mariadb:location}/bin/mysql_config
   --disable-static
   --disable-document
+post-install =
+  cp -ra ${mariadb:location}/lib/plugin/* ${:plugin-dir}
+plugin-dir = @@LOCATION@@/lib/plugin
 install-sql = @@LOCATION@@/share/mroonga/install.sql
+make-targets = plugindir=${:plugin-dir} install
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/mroonga_boolean.patch#c818568fe35ca6a4298f18e575d962a0

component/onlyoffice-core/buildout.cfg

@@ -12,7 +12,8 @@ parts +=
 
 [onlyoffice-core]
 recipe = slapos.recipe.cmmi
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+shared = true
+location = @@LOCATION@@
 # This url contains the hash provided by the DocumentServer core submodule hash.
 # https://github.com/ONLYOFFICE/DocumentServer/
 url = https://lab.nexedi.com/bk/onlyoffice_core/repository/archive.tar.bz2?ref=8a40eb47bd80a40ecde14c223525b21852d2fc9f

component/phantomjs/buildout.cfg

@@ -10,10 +10,6 @@ recipe = slapos.recipe.build
 slapos_promise =
   file:phantomjs-slapos
 
-depends =
-  ${liberation-fonts:location}
-  ${ipaex-fonts:location}
-
 x86 = https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-i686.tar.bz2 9c1426eef5b04679d65198b1bdd6ef88
 x86-64 = https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 f278996c3edd0e8d8ec4893807f27d71
 

component/poppler/buildout.cfg

@@ -13,6 +13,7 @@ extends =
 
 [poppler]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://poppler.freedesktop.org/poppler-0.43.0.tar.xz
 md5sum = 1d2b001663119855cdfbc0713dbfb9c6
 configure-options =

component/pysvn-python/buildout.cfg

@@ -19,7 +19,9 @@ patch-options = -p1
 patch-binary = ${patch:location}/bin/patch
 include-dirs =
   ${subversion:location}/include/subversion-1
-  ${apache:location}/include
+  ${apr:location}/include/apr-1
+  ${apr-util:location}/include/apr-1
 library-dirs =
   ${subversion:location}/lib
-  ${apache:location}/lib
+  ${apr:location}/lib
+  ${apr-util:location}/lib

component/qt/buildout.cfg

@@ -8,7 +8,8 @@ parts =
 [qt5-qmake]
 # XXX work on all systems needs check
 recipe = slapos.recipe.cmmi
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+shared = true
+location = @@LOCATION@@
 url = http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.gz
 md5sum = 7aa5841b50c411e23e31e8a6cc1c6981
 configure-command = ./configure

component/serf/buildout.cfg

@@ -9,11 +9,12 @@ extends =
 
 [serf]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://archive.apache.org/dist/serf/serf-1.2.1.tar.bz2
 md5sum = 4f8e76c9c6567aee1d66aba49f76a58b
 configure-options =
-  --with-apr=${apache:location}/bin/apr-1-config
-  --with-apr-util=${apache:location}/bin/apu-1-config
+  --with-apr=${apr:location}
+  --with-apr-util=${apr-util:location}
   --with-openssl=${openssl-1.0:location}
 environment =
   CFLAGS=-I${zlib:location}/include -I${libuuid:location}/include

component/snappy/buildout.cfg

@@ -6,9 +6,10 @@ parts =
 
 [snappy]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://github.com/google/snappy/archive/1.1.8.tar.gz
 md5sum = 70e48cba7fecf289153d009791c9977f
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = @@LOCATION@@
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
   -DCMAKE_INSTALL_PREFIX=${:location}

component/subversion/buildout.cfg

@@ -20,6 +20,7 @@ parts =
 
 [subversion]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://apache.mirrors.tds.net/subversion/subversion-1.8.14.tar.bz2
 md5sum = fe476ba26d6835eba4393780ea907361
 # Patch available thanks to gentoo developpers
@@ -28,8 +29,8 @@ patches =
   ${:_profile_base_location_}/subversion-fix-parallel-build-support-for-perl-bindings.patch#fd69f4c932b4882ed98c59eb102be64a
 configure-options =
   --disable-static
-  --with-apr=${apache:location}/bin/apr-1-config
-  --with-apr-util=${apache:location}/bin/apu-1-config
+  --with-apr=${apr:location}
+  --with-apr-util=${apr-util:location}
   --with-serf=yes
   --without-apxs
   --with-zlib=${zlib:location}
@@ -87,7 +88,7 @@ configure-options =
 make-options =
   -j1
 
-make-targets = 
+make-targets =
   install
   swig-py
   install-swig-py

setup.py

@@ -107,7 +107,6 @@ setup(name=name,
           'erp5.promise = slapos.recipe.erp5_promise:Recipe',
           'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',
           'erp5testnode = slapos.recipe.erp5testnode:Recipe',
-          'fontconfig = slapos.recipe.fontconfig:Recipe',
           'free_port = slapos.recipe.free_port:Recipe',
           'generate.mac = slapos.recipe.random:Mac',
           'generate.password = slapos.recipe.random:Password',

slapos/recipe/README.generic_cloudooo.rst

@@ -24,7 +24,7 @@ Here is an example of a section to add in your software.cfg :
   openoffice-port = 1235
   ooo-binary-path = ${directory:libreoffice-bin}/program
   environment =
-    FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
+    FONTCONFIG_FILE = $${fontconfig-conf:rendered}
     PATH = ${binary-link:target-directory}
   ooo-uno-path = ${directory:libreoffice-bin}/basis-link/program
 

slapos/recipe/erp5testnode/template/httpd.conf.in

@@ -71,7 +71,7 @@ SSLProxyEngine On
     DocumentRoot "%(testnode_log_directory)s"
     <Directory />
         Options Indexes FollowSymLinks
-        IndexOptions FancyIndexing
+        IndexOptions FancyIndexing NameWidth=* SuppressColumnSorting
         Require all granted
     </Directory>
 </VirtualHost>
@@ -86,7 +86,7 @@ Listen [%(ip)s]:%(software_access_port)s
     <Directory />
         AllowOverride AuthConfig
         Options FollowSymLinks
-        IndexOptions FancyIndexing
+        IndexOptions FancyIndexing NameWidth=* SuppressColumnSorting
         Require all denied
    </Directory>
 </VirtualHost>

slapos/recipe/fontconfig/__init__.py

-##############################################################################
-#
-# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-from slapos.recipe.librecipe import GenericBaseRecipe
-import pkg_resources
-import os
-import zc.buildout
-
-class Recipe(GenericBaseRecipe):
-  """
-  fontconfig instance configuration.
-
-  conf-path -- location of the configuration file
-
-  font-system-folder -- fonts installed by software release
-
-  font-folder -- location where to download fonts
-  """
-
-  def install(self):
-    created_file_list = []
-    font_folder = self.options['font-folder']
-    service_folder = self.options['service-folder']
-    snippet_filename = self.getTemplateFilename(
-                                    'fontconfig-snippet.cfg.in')
-    font_snippet_list = [self.substituteTemplate(snippet_filename,
-                    dict(font_folder_path=self.options['font-system-folder']))]
-    font_snippet_list.append(self.substituteTemplate(snippet_filename,
-                                           dict(font_folder_path=font_folder)))
-
-    config = dict(
-        font_folder_path_snippet=''.join(font_snippet_list),
-        )
-    template_filename = self.getTemplateFilename('fontconfig.cfg.in')
-    configuration_path = self.createFile(
-        self.options['conf-path'],
-        self.substituteTemplate(template_filename, config))
-
-    created_file_list.append(configuration_path)
-    return created_file_list

slapos/recipe/fontconfig/template/fontconfig-snippet.cfg.in

-<dir>%(font_folder_path)s</dir>

slapos/recipe/fontconfig/template/fontconfig.cfg.in

-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-<cachedir>~/.fontconfig</cachedir>
-%(font_folder_path_snippet)s
-</fontconfig>
\ No newline at end of file

software/apache-frontend/common.cfg

@@ -38,6 +38,11 @@ parts +=
   proxy-by-url
   http-proxy
 
+
+[apache]
+# install apache not shared, so that we can install antiloris modules
+shared = true
+
 [extra-eggs]
 recipe = zc.recipe.egg
 eggs =

software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
@@ -7,6 +8,7 @@ T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_site_1_access_log
 T-2/var/log/httpd/_site_1_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
+T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
@@ -16,6 +18,7 @@ T-2/var/log/httpd/_enable-http2-false_access_log
 T-2/var/log/httpd/_enable-http2-false_error_log
 T-2/var/log/httpd/_enable-http2-true_access_log
 T-2/var/log/httpd/_enable-http2-true_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
+T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
@@ -16,6 +18,7 @@ T-2/var/log/httpd/_enable-http2-false_access_log
 T-2/var/log/httpd/_enable-http2-false_error_log
 T-2/var/log/httpd/_enable-http2-true_access_log
 T-2/var/log/httpd/_enable-http2-true_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
+T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
@@ -16,6 +18,7 @@ T-2/var/log/httpd/_enable-http2-false_access_log
 T-2/var/log/httpd/_enable-http2-false_error_log
 T-2/var/log/httpd/_enable-http2-true_access_log
 T-2/var/log/httpd/_enable-http2-true_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
+T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
@@ -16,6 +18,7 @@ T-2/var/log/httpd/_enable-http2-false_access_log
 T-2/var/log/httpd/_enable-http2-false_error_log
 T-2/var/log/httpd/_enable-http2-true_access_log
 T-2/var/log/httpd/_enable-http2-true_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
@@ -7,6 +8,7 @@ T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_empty_access_log
 T-2/var/log/httpd/_empty_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
+T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
@@ -10,6 +12,7 @@ T-2/var/log/httpd-cache-direct/_waitforcaddyslave_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_waitforcaddyslave_access_log
 T-2/var/log/httpd/_waitforcaddyslave_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
+T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
@@ -10,6 +12,7 @@ T-2/var/log/httpd-cache-direct/_waitforcaddyslave_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_waitforcaddyslave_access_log
 T-2/var/log/httpd/_waitforcaddyslave_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
+T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
@@ -10,6 +12,7 @@ T-2/var/log/httpd-cache-direct/_url_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_url_access_log
 T-2/var/log/httpd/_url_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
+T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
@@ -10,6 +12,7 @@ T-2/var/log/httpd-cache-direct/_default_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_default_access_log
 T-2/var/log/httpd/_default_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
@@ -7,6 +8,7 @@ T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_default_access_log
 T-2/var/log/httpd/_default_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
@@ -9,6 +10,7 @@ T-2/var/log/httpd-cache-direct/_replicate_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_replicate_access_log
 T-2/var/log/httpd/_replicate_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
+T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
@@ -130,6 +132,7 @@ T-2/var/log/httpd/_type-zope_access_log
 T-2/var/log/httpd/_type-zope_error_log
 T-2/var/log/httpd/_url_https-url_access_log
 T-2/var/log/httpd/_url_https-url_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
@@ -21,6 +22,7 @@ T-2/var/log/httpd/_virtualhostroot-http-port-unsafe_access_log
 T-2/var/log/httpd/_virtualhostroot-http-port-unsafe_error_log
 T-2/var/log/httpd/_virtualhostroot-https-port-unsafe_access_log
 T-2/var/log/httpd/_virtualhostroot-https-port-unsafe_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
+T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
@@ -14,6 +16,7 @@ T-2/var/log/httpd/_default_ciphers_access_log
 T-2/var/log/httpd/_default_ciphers_error_log
 T-2/var/log/httpd/_own_ciphers_access_log
 T-2/var/log/httpd/_own_ciphers_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
+T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
@@ -130,6 +132,7 @@ T-2/var/log/httpd/_type-zope_access_log
 T-2/var/log/httpd/_type-zope_error_log
 T-2/var/log/httpd/_url_https-url_access_log
 T-2/var/log/httpd/_url_https-url_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
+T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
@@ -32,6 +34,7 @@ T-2/var/log/httpd/_type-notebook-ssl_from_slave_access_log
 T-2/var/log/httpd/_type-notebook-ssl_from_slave_error_log
 T-2/var/log/httpd/_type-notebook-ssl_from_slave_kedifa_overrides_access_log
 T-2/var/log/httpd/_type-notebook-ssl_from_slave_kedifa_overrides_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
+T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
@@ -10,6 +12,7 @@ T-2/var/log/httpd-cache-direct/_ssl_from_master_kedifa_overrides_master_certific
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_master_certificate_access_log
 T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_master_certificate_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_log-CADDY.txt

+T-0/var/log/monitor-httpd-access.log
 T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
+T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
@@ -10,6 +12,7 @@ T-2/var/log/httpd-cache-direct/_ssl_from_master_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_ssl_from_master_access_log
 T-2/var/log/httpd/_ssl_from_master_error_log
+T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/cloudooo/buildout.hash.cfg

@@ -18,4 +18,4 @@ md5sum = 6e4431cf4b0a0d034402604b1e2844c0
 
 [template-cloudooo-instance]
 filename = instance-cloudooo.cfg.in
-md5sum = 5fc0919cc3eab365f773c6eb73f9c6c3
+md5sum = e01ee969a45d44d386653a9eb699cc59

software/cloudooo/instance-cloudooo.cfg.in

@@ -167,13 +167,31 @@ recipe = slapos.cookbook:publish.serialised
 {{   family_name }} = {{ scheme ~ '://' ~ ipv4 ~ ':' ~ apache_port }}
 {% endfor -%}
 
+[fontconfig-conf]
+recipe = slapos.recipe.template:jinja2
+template = {{ parameter_dict['template-fonts-conf'] }}
+rendered = ${directory:etc}/fonts.conf
+context =
+    key cachedir directory:fontconfig-cache
+    key fonts :fonts
+    key includes :includes
+fonts =
+{% for font in parameter_dict['fonts'].splitlines() %}
+   {{ font }}
+{% endfor%}
+    ${directory:font}
+includes =
+{% for include in parameter_dict['fontconfig-includes'].splitlines() %}
+   {{ include }}
+{% endfor%}
 
 [cloudooo-base]
 recipe = slapos.cookbook:generic.cloudooo
 ip = {{ ipv4 }}
 environment =
   LD_LIBRARY_PATH = {{ parameter_dict['cairo'] }}/lib:{{ parameter_dict['cups'] }}/lib:{{ parameter_dict['cups'] }}/lib64:{{ parameter_dict['dbus'] }}/lib:{{ parameter_dict['dbus-glib'] }}/lib:{{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['glib'] }}/lib:{{ parameter_dict['glu'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['libexpat'] }}/lib:{{ parameter_dict['libffi'] }}/lib:{{ parameter_dict['libffi'] }}/lib64:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['mesa'] }}/lib:{{ parameter_dict['pixman'] }}/lib:{{ parameter_dict['xdamage'] }}/lib:{{ parameter_dict['xfixes'] }}/lib:{{ parameter_dict['zlib'] }}/lib
-  FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
+  FONTCONFIG_FILE = ${fontconfig-conf:rendered}
+
   PATH = ${binary-link:target-directory}
 mimetype_entry_addition =
 {% for entry in mimetype_entry_addition.splitlines() -%}
@@ -226,14 +244,6 @@ configuration-file = ${cloudooo-0:configuration-file}
 run-unit-test-binary = {{ bin_directory }}/runCloudoooUnitTest
 run-test-suite-binary = {{ bin_directory }}/runCloudoooTestSuite
 
-[fontconfig-instance]
-recipe = slapos.cookbook:fontconfig
-conf-path = ${directory:etc}/font.conf
-font-system-folder = {{ parameter_dict['fonts'] }}
-font-folder = ${directory:font}
-service-folder = ${directory:services}
-
-
 [binary-link]
 recipe = slapos.cookbook:symbolic.link
 target-directory = ${directory:bin}
@@ -264,6 +274,7 @@ certs = ${:ca-dir}/certs
 crl = ${:ca-dir}/crl
 etc = ${buildout:directory}/etc
 font = ${:srv}/font
+fontconfig-cache = ${buildout:directory}/.fontconfig
 log = ${:var}/log
 newcerts = ${:ca-dir}/newcerts
 private = ${:ca-dir}/private

software/cloudooo/software-common.cfg

@@ -54,7 +54,23 @@ dbus = ${dbus:location}
 dbus-glib = ${dbus-glib:location}
 file = ${file:location}
 fontconfig = ${fontconfig:location}
-fonts = ${fonts:location}
+template-fonts-conf = ${template-fonts-conf:output}
+fonts =
+  ${android-fonts:location}
+  ${ipa-fonts:location}
+  ${ipaex-fonts:location}
+  ${liberation-fonts:location}
+  ${ocrb-fonts:location}
+# XXX These fonts have always been missing in cloudooo, but we want
+# keep compatibility a little bit more.
+#  ${dejavu-fonts:location}
+#  ${libreoffice-bin:location}/share/fonts/
+
+# XXX fonts-include also have always been missing, which causes wrong
+# font selections in cloudooo, such as using a serif fonts for Arial
+fontconfig-includes =
+#    ${fontconfig:location}/etc/fonts/conf.d
+
 freetype = ${freetype:location}
 glib = ${glib:location}
 glu = ${glu:location}

software/cython-test/runTestSuite.in

@@ -7,19 +7,10 @@ from time import gmtime, strftime, time
 from unittest import TextTestResult
 from erp5.util import taskdistribution, testsuite
 
-{%- if prepend_path is defined %}
-PATH = os.environ['PATH']
-os.environ['PATH'] = {{ repr(prepend_path) }} + (PATH and os.pathsep + PATH)
-{%- endif %}
 os.environ['TEMP'] = {{ repr(tmpdir) }}
-os.environ['PYTHON'] = sys.executable
-os.environ['PYTHONPATH'] = os.pathsep.join(
-  sys.path[:-int(subprocess.check_output((
-    sys.executable, '-c', 'import sys;print(len(sys.path))')))])
-
-command = """set -e {{ gettext_location }}/lib
-make
-LD_RUN_PATH=$1 LIBRARY_PATH=$1 make test
+
+command = """. {{ cython_env_sh }}
+make all test
 """
 
 def parseTestStdOut(data):

software/cython-test/software.cfg

@@ -41,19 +41,14 @@ template =
     key tmpdir directory:tmp
     key slapparameter_dict slap-configuration:configuration
     key cython_repository cython-repository:location
-    raw runTestSuite_py ${buildout:bin-directory}/${runTestSuite_py:interpreter}
-    raw gettext_location ${gettext:location}
-  {%- if 'part' in gcc %}
-    raw prepend_path {{ gcc.prefix }}/bin
-  {%- endif %}
+    raw runTestSuite_py ${runTestSuite_py:bin-directory}/${runTestSuite_py:interpreter}
+    raw cython_env_sh ${cython_env.sh:rendered}
 
   [cython-repository]
   recipe = slapos.recipe.build:gitclone
   repository = ${cython-repository:location}
   git-executable = ${git:location}/bin/git
   shared = true
-context =
-  section gcc gcc
 
 [cython-repository]
 recipe = slapos.recipe.build:gitclone
@@ -64,16 +59,45 @@ sparse-checkout = /.gitignore
 [runTestSuite.in]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_buildout_section_name_}
-md5sum = aea029e484875a1e6e69f9e2e1d9efdd
+md5sum = 02094e80cde9631081077fc96b401065
 
 [runTestSuite_py]
 recipe = zc.recipe.egg
+eggs = erp5.util
+interpreter = ${:_buildout_section_name_}
+
+[eggs]
+recipe = zc.recipe.egg
 eggs =
-  erp5.util
   ${numpy:egg}
   coverage
   pycodestyle
-interpreter = ${:_buildout_section_name_}
+
+[cython_env.sh]
+recipe = slapos.recipe.template:jinja2
+rendered = ${buildout:directory}/${:_buildout_section_name_}
+template =
+  inline:{% set path, python = os.path.split(python) -%}
+  {% if 'part' in gcc -%}
+  {%   set path = path + ':' + gcc.prefix + '/bin' -%}
+  {% endif -%}
+  export PATH={{ path }}:$PATH
+  export PYTHON={{ python }}
+  export PYTHONPATH={{ ':'.join(easy_install.working_set(eggs['eggs'].split(), [
+      eggs['develop-eggs-directory'],
+      eggs['eggs-directory'],
+    ]).entries) }}$${PYTHONPATH:+:$PYTHONPATH}
+  # EmbedTest needs libintl.
+  export LD_RUN_PATH={{ gettext }}/lib$${LD_RUN_PATH:+:$LD_RUN_PATH}
+  export LIBRARY_PATH={{ gettext }}/lib$${LIBRARY_PATH:+:$LIBRARY_PATH}
+  {##}
+context =
+  section eggs eggs
+  section gcc gcc
+  key gettext gettext:location
+  key python python:executable
+  import os os
+  import easy_install zc.buildout.easy_install
 
 [versions]
 slapos.recipe.template = 4.4

software/erp5/test/test/test_mariadb.py

@@ -182,6 +182,49 @@ class TestMroonga(MariaDBTestCase):
           cnx.store_result().fetch_row(maxrows=2),
       )
 
+  def test_mroonga_full_text_normalizer_TokenBigramSplitSymbolAlphaDigit(self):
+    # Similar to as ERP5's testI18NSearch with erp5_full_text_mroonga_catalog
+    cnx = self.getDatabaseConnection()
+    with contextlib.closing(cnx):
+      cnx.query(
+          """
+            CREATE TABLE `full_text` (
+              `uid` BIGINT UNSIGNED NOT NULL,
+              `SearchableText` MEDIUMTEXT,
+              PRIMARY KEY  (`uid`),
+              FULLTEXT `SearchableText` (`SearchableText`) COMMENT 'parser "TokenBigramSplitSymbolAlphaDigit"'
+            ) ENGINE=mroonga
+          """)
+      cnx.store_result()
+      cnx.query(
+          """
+            INSERT INTO full_text VALUES
+            (1, "Gabriel Fauré Quick brown fox jumps over the lazy dog"),
+            (2, "武者小路 実篤 Slow white fox jumps over the diligent dog."),
+            (3, "( - + )")""")
+      cnx.store_result()
+      cnx.query(
+          """
+          SELECT uid
+            FROM full_text
+            WHERE MATCH (`full_text`.`SearchableText`) AGAINST ('*D+ Faure' IN BOOLEAN MODE)
+          """)
+      self.assertEqual(((1,),), cnx.store_result().fetch_row(maxrows=2))
+      cnx.query(
+          """
+          SELECT uid
+            FROM full_text
+            WHERE MATCH (`full_text`.`SearchableText`) AGAINST ('*D+ 武者' IN BOOLEAN MODE)
+          """)
+      self.assertEqual(((2,),), cnx.store_result().fetch_row(maxrows=2))
+      cnx.query(
+          """
+          SELECT uid
+            FROM full_text
+            WHERE MATCH (`full_text`.`SearchableText`) AGAINST ('*D+ +quick +fox +dog' IN BOOLEAN MODE)
+          """)
+      self.assertEqual(((1,),), cnx.store_result().fetch_row(maxrows=2))
+
   def test_mroonga_full_text_stem(self):
     # example from https://mroonga.org//docs/tutorial/storage.html#how-to-specify-the-token-filters
     cnx = self.getDatabaseConnection()

software/erp5testnode/buildout.hash.cfg

@@ -18,4 +18,4 @@ md5sum = 307663d73ef3ef94b02567ecd322252e
 
 [template-default]
 filename = instance-default.cfg
-md5sum = 3c2420de64f079b3b3231dfbff1633b5
+md5sum = 4ebd9eed7c15a158efb342dd7c9672f0

software/erp5testnode/instance-default.cfg

@@ -8,7 +8,7 @@ offline = true
 extends = ${monitor2-template:rendered}
 
 parts =
-  testnode
+  testnode-service
   certificate-authority
   ca-shellinabox
   ca-httpd-testnode
@@ -18,7 +18,7 @@ parts =
   resiliency-exclude-file
   shellinabox-frontend-reload
   promises
-  
+
 [monitor-publish]
 recipe = slapos.cookbook:publish
 url = $${shellinabox-frontend:url}
@@ -47,6 +47,7 @@ ipv6-address = $${slap-network-information:global-ipv6}
 test-suite-master-url = $${slap-parameter:test-suite-master-url}
 instance-dict = $${slap-parameter:instance-dict}
 software-path-list = $${slap-parameter:software-path-list}
+keep-log-days = $${slap-parameter:keep-log-days}
 git-binary = ${git:location}/bin/git
 slapos-binary = ${buildout:bin-directory}/slapos
 testnode = ${buildout:bin-directory}/testnode
@@ -65,7 +66,7 @@ httpd-key-file = $${rootdirectory:etc}/httpd-private.key
 
 configuration-file = $${rootdirectory:etc}/erp5testnode.cfg
 log-file = $${basedirectory:log}/erp5testnode.log
-wrapper = $${basedirectory:services}/erp5testnode
+wrapper = $${buildout:bin-directory}/erp5testnode-service
 
 # Binaries
 apache-binary = ${apache:location}/bin/httpd
@@ -73,6 +74,14 @@ apache-modules-dir = ${apache:location}/modules
 apache-mime-file = ${apache:location}/conf/mime.types
 apache-htpasswd = ${apache:location}/bin/htpasswd
 
+[testnode-service]
+# wrapper over erp5testnode which restarts the service when configuration changed
+recipe = slapos.cookbook:wrapper
+wrapper-path = $${basedirectory:services}/erp5testnode
+command-line = $${testnode:wrapper}
+hash-files =
+  $${testnode:wrapper}
+  $${testnode:configuration-file}
 
 [shell-environment]
 shell = ${bash:location}/bin/bash
@@ -129,7 +138,7 @@ pidfile = $${basedirectory:run}/$${:_buildout_section_name_}.pid
 recipe = slapos.cookbook:wrapper
 wrapper-path = $${basedirectory:services}/$${:_buildout_section_name_}
 command-line =
-  ${bash:location}/bin/bash -c 
+  ${bash:location}/bin/bash -c
   "kill -s USR1 $$(${coreutils:location}/bin/cat $${shellinabox-frontend:pidfile}) \
     && ${coreutils:location}/bin/sleep infinity"
 hash-files =
@@ -232,3 +241,4 @@ node-quantity = 1
 test-suite-master-url =
 instance-dict =
 software-path-list = ["https://lab.nexedi.com/nexedi/slapos/raw/2063375310edea5991786083803e8bca9069ae17/software/seleniumrunner/software.cfg"]
+keep-log-days = 15

software/erp5testnode/instance-erp5testnode-input-schema.json

@@ -17,6 +17,12 @@
       "title": "Task Distribution URL",
       "description": "Url for the task distributor master on portal_task_distribution",
       "type": "string"
+    },
+    "keep-log-days": {
+      "title": "Retention of test logs",
+      "description": "Number of days to keep logs and snapshots",
+      "type": "number",
+      "default": 15
     }
   }
 }

software/grafana/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance-profile]
 filename = instance.cfg.in
-md5sum = 0edf9e67bc637d73a7415124c8082a8c
+md5sum = 13f4f3806522b265dd1912ff169d146d
 
 [influxdb-config-file]
 filename = influxdb-config-file.cfg.in

software/grafana/instance.cfg.in

@@ -267,6 +267,10 @@ config-url = ${grafana:url}
 config-https-only = true
 return = domain secure_access
 
+[apache-frontend-available-promise]
+<= check-url-available-promise
+url = ${apache-frontend:connection-secure_access}
+
 
 [promises]
 recipe =
@@ -277,6 +281,8 @@ instance-promises =
   ${grafana-listen-promise:path}
   ${loki-listen-promise:path}
   ${promtail-listen-promise:path}
+  ${promtail-listen-promise:path}
+  ${apache-frontend-available-promise:path}
 
 
 [publish-connection-parameter]

software/kvm/buildout.hash.cfg

@@ -15,11 +15,11 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = 763f66b915839a9b073fb93f43a44493
+md5sum = 092405e2fba77c22d4dc8cefcab677d8
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = 0db4ed796808b892a2e8a0aea704b13e
+md5sum = 285558df4686116a92b39250f9e00f07
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in

software/kvm/instance-kvm.cfg.jinja2

@@ -539,7 +539,8 @@ ipv6-network-info =
 recipe = plone.recipe.command
 filename = netconfig.sh
 path = ${directory:public}/${:filename}
-ipv4-add-address = ip -4 address add {{ slap_configuration.get('tap-ipv4-addr') }}/{{ slap_configuration.get('tap-ipv4-netmask') }} dev \$IFACE
+ipv4-add-address = ip -4 address add {{ slap_configuration.get('tap-ipv4-addr') }}/{{ slap_configuration.get('tap-ipv4-netmask') }} dev \$IFACE noprefixroute
+ipv4-add-gateway-route = ip -4 address add {{ slap_configuration.get('tap-ipv4-gateway') }} dev \$IFACE
 {%   if nat_restrict == 'true' -%}
 ipv4-add-default-route = ip route add default via {{ slap_configuration.get('tap-ipv4-gateway') }} dev \$IFACE
 {%   elif global_ipv4_prefix -%}
@@ -556,6 +557,7 @@ command =
   ip a | grep eth0: && [ \$IFACE = ens3 ] && IFACE=eth0
   ip a | grep eth1: && [ \$IFACE = ens4 ] && IFACE=eth1
   ${:ipv4-add-address}
+  ${:ipv4-add-gateway-route}
   ${:ipv4-add-default-route}
   ${:ipv4-set-link-up}
   EOF

software/kvm/instance.cfg.in

@@ -146,7 +146,7 @@ context =
     key eggs_directory buildout:eggs-directory
     raw qemu_location ${kvm:location}
     raw template_kvm_import ${template-kvm-import-script:location}/${template-kvm-import-script:filename}
-    raw pbsready_import_template ${pbsready-import:output}
+    key pbsready_import_template template-pbsready-import:rendered
     key slapparameter_dict slap-configuration:configuration
     raw zcat_binary ${gzip:location}/bin/zcat
     raw gzip_binary ${gzip:location}/bin/gzip

software/plantuml/buildout.hash.cfg

@@ -15,12 +15,8 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = f35aa36b41cd197ab3d763dcb884e96a
+md5sum = d1dff3fc39eefc57b36dbaa195b6890e
 
 [tomcat-server-xml]
 filename = server.xml.in
 md5sum = fdfa7eb249082855039ca98f310324e9
-
-[font.conf]
-filename = font.conf.in
-md5sum = caa3463c9c3766ac5f2396a517d6f926

software/plantuml/font.conf.in

-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <cachedir>$${:fontcache}</cachedir>
-  <!-- installed fonts: $${:installed-fonts} -->
-  <dir>${fonts:location}</dir>
-  <dir>$${:fonts}</dir>
-  <include>${fontconfig:location}/etc/fonts/conf.d</include>
-</fontconfig>
\ No newline at end of file

software/plantuml/instance.cfg.in

@@ -10,20 +10,23 @@ offline = true
 extends = ${monitor2-template:rendered}
 
 [fontconfig-conf]
-recipe = slapos.recipe.template
-url = ${font.conf:output}
-output = $${directory:etc}/font.conf
-
-fonts = $${directory:fonts}
-fontcache = $${directory:fontcache}
-installed-fonts =
-  ${liberation-fonts:location}
-  ${ipaex-fonts:location}
-  ${ipa-fonts:location}
-  ${ocrb-fonts:location}
-  ${android-fonts:location}
-  ${dejavu-fonts:location}
-
+recipe = slapos.recipe.template:jinja2
+template = ${template-fonts-conf:output}
+rendered = $${directory:etc}/fonts.conf
+context =
+    key cachedir directory:fontconfig-cache
+    key fonts :fonts
+    key includes :includes
+fonts =
+    ${android-fonts:location}
+    ${dejavu-fonts:location}
+    ${ipa-fonts:location}
+    ${ipaex-fonts:location}
+    ${liberation-fonts:location}
+    ${ocrb-fonts:location}
+    $${directory:fonts}
+includes =
+    ${fontconfig:location}/etc/fonts/conf.d
 [tomcat-server-xml]
 recipe = slapos.recipe.template
 url = ${tomcat-server-xml:output}
@@ -59,7 +62,7 @@ environment =
   JRE_HOME=${java-re-8:location}
   CATALINA_BASE=$${directory:catalina_base}
   GRAPHVIZ_DOT=${graphviz:location}/bin/dot
-  FONTCONFIG_FILE=$${fontconfig-conf:output}
+  FONTCONFIG_FILE=$${fontconfig-conf:rendered}
   LD_LIBRARY_PATH=${fontconfig:location}/lib:${freetype:location}/lib
 # XXX java is still loading system fonts ... ( even with $JAVA_FONTS or -Djava.awt.fonts )
 # related links:
@@ -110,9 +113,8 @@ srv = $${buildout:directory}/srv
 bin = $${buildout:directory}/bin
 tmp = $${buildout:directory}/tmp
 services = $${:etc}/service
-
+fontconfig-cache = $${buildout:directory}/.fontconfig
 fonts = $${:srv}/fonts/
-fontcache = $${buildout:directory}/.fontcache/
 
 # tomcat directories
 catalina_base = $${:var}/tomcat

software/plantuml/software.cfg

@@ -25,11 +25,6 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/${:_buildout_section_name_}
 
-[font.conf]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/${:filename}
-output = ${buildout:directory}/${:_buildout_section_name_}
-
 [plantuml.war]
 recipe = slapos.recipe.build:download
 url = https://downloads.sourceforge.net/project/plantuml/1.2018.13/plantuml.1.2018.13.war

software/seleniumserver/buildout.hash.cfg

@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88
 
 [template-selenium]
 filename = instance-selenium.cfg.in
-md5sum = 1f0b67d2a542e94380c35afc9cd1946b
+md5sum = 269ac5ce96695ede3ee917c6ce17ae2d

software/seleniumserver/instance-selenium.cfg.in

@@ -6,15 +6,28 @@ parts =
 
 extends = ${monitor-template:rendered}
 eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory} 
+develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-[fontconfig-instance]
-recipe = slapos.cookbook:fontconfig
-conf-path = $${directory:etc}/font.conf
-font-system-folder = ${fonts:location}
-font-folder = $${directory:fonts}
-service-folder = $${directory:services}
+[fontconfig-conf]
+recipe = slapos.recipe.template:jinja2
+template = ${template-fonts-conf:output}
+rendered = $${directory:etc}/fonts.conf
+context =
+    key cachedir directory:fontconfig-cache
+    key fonts :fonts
+    key includes :includes
+fonts =
+    ${android-fonts:location}
+    ${dejavu-fonts:location}
+    ${ipa-fonts:location}
+    ${ipaex-fonts:location}
+    ${liberation-fonts:location}
+    ${ocrb-fonts:location}
+    $${directory:fonts}
+# XXX we don't include conf.d for now, to keep compatibility with current font selection problems.
+includes =
+#    ${fontconfig:location}/etc/fonts/conf.d
 
 [xvfb-instance]
 recipe = slapos.cookbook:wrapper
@@ -79,7 +92,7 @@ environment =
   PATH=${buildout:bin-directory}
   XORG_LOCK_DIR=$${directory:tmp}
   DISPLAY=$${xvfb-instance:display}
-  FONTCONFIG_FILE=$${fontconfig-instance:conf-path}
+  FONTCONFIG_FILE=$${fontconfig-conf:rendered}
 hostname = $${instance-parameter:ipv4-random}
 
 
@@ -331,5 +344,7 @@ tmp = $${buildout:directory}/tmp
 services = $${:etc}/service
 framebuffer = $${:srv}/framebuffer
 fonts = $${:srv}/fonts/
+fontconfig-cache = $${buildout:directory}/.fontconfig
+
 ssh = $${:etc}/ssh
 run = $${:var}/run
\ No newline at end of file

software/seleniumserver/software.cfg

@@ -12,6 +12,8 @@ extends =
    ../../component/java/buildout.cfg
    ../../component/caddy/buildout.cfg
    ../../component/openssh/buildout.cfg
+   ../../component/fonts/buildout.cfg
+   ../../component/fontconfig/buildout.cfg
    ../../stack/slapos.cfg
    ./buildout.hash.cfg
    ../../stack/monitor/buildout.cfg

software/slapos-sr-testing/software.cfg

@@ -291,4 +291,6 @@ mock = 2.0.0
 testfixtures = 6.11
 funcsigs = 1.0.2
 PyPDF2 = 1.26.0
-mysqlclient = 1.3.12
+mysqlclient = 1.3.12
\ No newline at end of file
+pexpect = 4.8.0
+ptyprocess = 0.6.0

software/theia/buildout.hash.cfg

@@ -15,12 +15,12 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = 21735765808aac82fb91d53341a3c0d6
+md5sum = 99dfaa031e58518326b731e9218aa425
 
 [yarn.lock]
 filename = yarn.lock
-md5sum = c2523a5c832f617c374ee621d50d9e52
+md5sum = ae1b596804715acd3512f1e8e6cbae3b
 
 [python-language-server-requirements.txt]
 filename = python-language-server-requirements.txt
-md5sum = 6db2a484cac19787fecd87fffefa4aa9
+md5sum = 2a296cba4c36d7a5fca5f4347a8c8469

software/theia/instance.cfg.in

@@ -50,8 +50,10 @@ template = inline:
     tls {
       alpn http/1.1
     }
+    root $${directory:frontend-static}
+    browse
     proxy / $${theia-instance:base-url} {
-    #  transparent
+      except public $${favicon.ico:filename}
     }
     proxy /services $${theia-instance:base-url} {
       websocket
@@ -89,6 +91,29 @@ hash-files =
   $${frontend-instance:wrapper-path}
 wait-for-files = $${frontend-instance:pidfile}
 
+[favicon.ico]
+# generate a pseudo random favicon, different for each instance name.
+recipe = slapos.recipe.build
+install =
+  import hashlib, shutil
+  buildout_offline = self.buildout['buildout']['offline']
+  self.buildout['buildout']['offline'] = 'false'
+  try:
+    gravatar_url = "https://www.gravatar.com/avatar/" + hashlib.md5(
+      '''$${slap-configuration:root-instance-title}'''
+    ).hexdigest() + "?s=256&d=retro"
+    shutil.copy(self.download(gravatar_url), '''$${:location}''')
+  except Exception:
+    # Because installation should work offline, if we can't download a favicon,
+    # just ignore this step.
+    self.logger.exception("Error while downloading favicon, using empty one")
+    open('''$${:location}''', 'w').close()
+  finally:
+    self.buildout['buildout']['offline'] = buildout_offline
+
+location = $${directory:frontend-static}/$${:filename}
+filename = $${:_buildout_section_name_}
+
 [user]
 recipe = slapos.cookbook:userinfo
 
@@ -96,7 +121,7 @@ recipe = slapos.cookbook:userinfo
 recipe = slapos.cookbook:wrapper
 wrapper-path = $${directory:services}/$${:_buildout_section_name_}
 command-line =
-  env LC_ALL=C.UTF-8 TMP=$${directory:tmp} ${theia-wrapper:rendered} --hostname=$${:hostname} --port=$${:port}
+  env LC_ALL=C.UTF-8 TMP=$${directory:tmp} THEIA_SHELL=$${theia-shell:wrapper-path} ${theia-wrapper:rendered} --hostname=$${:hostname} --port=$${:port} $${directory:project}
 
 ip =  $${instance-parameter:ipv4-random}
 hostname =  $${:ip}
@@ -106,11 +131,37 @@ hash-existing-files =
   ${yarn.lock:output}
   ${theia-wrapper:rendered}
 
+[theia-shell]
+recipe = slapos.cookbook:wrapper
+wrapper-path = $${directory:bin}/$${:_buildout_section_name_}
+# reset GIT_EXEC_PATH to workaround https://github.com/eclipse-theia/theia/issues/7555
+# activate slapos configuration
+command-line =
+  ${bash:location}/bin/bash -c ". $${slapos-standalone-activate:rendered} && exec env GIT_EXEC_PATH= ${bash:location}/bin/bash"
+
+[slapos-standalone-activate]
+recipe = slapos.recipe.template:jinja2
+rendered = $${directory:bin}/$${:_buildout_section_name_}
+mode = 0700
+# XXX maybe standalone slapos should provide an activate script like virtualenv is doing?
+template =
+  inline:#!/bin/sh
+  export PATH=${buildout:bin-directory}:$PATH
+  ${slapos-standalone:script-path} $${directory:slapos} $${:ipv4} $${:ipv6} $${:port}
+  export SLAPOS_CONFIGURATION=$${directory:slapos}/etc/slapos.cfg
+  export SLAPOS_CLIENT_CONFIGURATION=$SLAPOS_CONFIGURATION
+
+ipv4 = $${instance-parameter:ipv4-random}
+ipv6 = $${instance-parameter:ipv6-random}
+port = 4000
+
+
 [promises]
 recipe =
 instance-promises =
   $${theia-listen-promise:name}
   $${frontend-listen-promise:name}
+  $${apache-frontend-url-available-promise:name}
 
 [theia-listen-promise]
 <= monitor-promise-base
@@ -126,6 +177,13 @@ name = $${:_buildout_section_name_}.py
 config-hostname = $${frontend-instance:ip}
 config-port = $${frontend-instance:port}
 
+[apache-frontend-url-available-promise]
+<= monitor-promise-base
+module = check_url_available
+name = $${:_buildout_section_name_}.py
+config-url = $${apache-frontend:connection-secure_access}
+config-check-secure = 1
+
 [apache-frontend]
 <= slap-connection
 recipe = slapos.cookbook:requestoptional
@@ -163,6 +221,7 @@ tmp = $${buildout:directory}/tmp
 pidfiles = $${:var}/run
 
 services = $${:etc}/service
-framebuffer = $${:srv}/framebuffer
-fonts = $${:srv}/fonts
-home = $${:srv}/home
+project = $${:srv}/project
+slapos = $${:srv}/slapos
+frontend-static = $${:srv}/frontend-static
+frontend-static-public = $${:frontend-static}/public

software/theia/python-language-server-requirements.txt

@@ -26,4 +26,4 @@ typed-ast==1.4.1
 typing-extensions==3.7.4.2
 wrapt==1.11.2
 yapf==0.29.0
-zc.buildout.languageserver==0.2.0
+zc.buildout.languageserver==0.2.1

software/theia/software.cfg

@@ -4,6 +4,11 @@ extends =
    ../../component/caddy/buildout.cfg
    ../../component/git/buildout.cfg
    ../../component/bash/buildout.cfg
+   ../../component/fish-shell/buildout.cfg
+   ../../component/tmux/buildout.cfg
+   ../../component/tig/buildout.cfg
+   ../../component/vim/buildout.cfg
+   ../../component/curl/buildout.cfg
    ../../component/coreutils/buildout.cfg
    ../../stack/slapos.cfg
    ../../stack/monitor/buildout.cfg
@@ -20,6 +25,9 @@ parts =
   slapos-cookbook
   instance
 
+# default for slapos-standalone
+shared-part-list =
+
 
 [nodejs]
 <= nodejs-10.19.0
@@ -33,12 +41,66 @@ recipe = slapos.recipe.build:download-unpacked
 url = https://github.com/yarnpkg/yarn/releases/download/v${:version}/yarn-v${:version}.tar.gz
 md5sum = 4a02e1687a150113ad6b0215f9afdb3e
 
+[slapos-standalone]
+recipe = zc.recipe.egg
+eggs =
+  slapos.core
+scripts = ${:_buildout_section_name_}
+script-path = ${buildout:bin-directory}/${:scripts}
+# XXX generate a fake entry point for a non existant module, that will not
+# be used because we exit in initialization step
+entry-points =
+  ${:scripts}=not_used:main
+initialization =
+  import argparse
+  import os.path
+  import sys
+  import glob
+
+  import slapos.slap.standalone
+
+  parser = argparse.ArgumentParser()
+  parser.add_argument('base_directory')
+  parser.add_argument('ipv4')
+  parser.add_argument('ipv6')
+  parser.add_argument('server_port', type=int)
+  args = parser.parse_args()
+  shared_part_list = [x.strip() for x in '''${buildout:shared-part-list}'''.splitlines() if x.strip()]
+
+  standalone = slapos.slap.standalone.StandaloneSlapOS(
+      args.base_directory,
+      args.ipv4,
+      args.server_port,
+      shared_part_list=shared_part_list
+  )
+  standalone.start()
+  partition_count = 20
+  if len(glob.glob(os.path.join(standalone.instance_directory, '*'))) < partition_count:
+    print("Standalone SlapOS: Formatting {partition_count} partitions".format(
+        partition_count=partition_count))
+    standalone.format(
+        partition_count,
+        args.ipv4,
+        args.ipv6
+    )
+  print ("Standalone SlapOS for computer `{}` activated".format(standalone.computer._computer_id))
+  sys.exit(0)
+
+needs-these-eggs-scripts-in-path =
+  ${supervisor:recipe}
+  ${slapos-command:recipe}
+
+[supervisor]
+recipe = zc.recipe.egg
+eggs =
+  supervisor
+  setuptools
 
 [python-language-server]
 version = 0.19.0
 recipe = plone.recipe.command
 command =
-  bash -c "${python3:executable} -m venv ${:location} && \
+  PATH=${git:location}/bin/:$PATH  bash -c "${python3:executable} -m venv ${:location} && \
     . ${:location}/bin/activate && \
     pip install -r ${python-language-server-requirements.txt:output}"
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -77,9 +139,7 @@ mode = 0644
 
 [package.json]
 recipe = slapos.recipe.template:jinja2
-# this comes from https://github.com/theia-ide/theia-apps/blob/0cc6a3dc2a6dec1b2b4f9572e9d878a67dc81ff5/theia-full-docker/latest.package.json
-# but we pin vscode-json-languageserver to 1.2.2, otherwise 1.2.3 is picked and it seems to be incompatible.*
-# See https://github.com/theia-ide/theia-apps/issues/333
+# this comes from https://github.com/theia-ide/theia-apps/blob/2991e3a433f031b22bc80e274f80620d1e6898e5/theia-full-docker/latest.package.json
 template =
   inline:{
       "private": true,
@@ -145,6 +205,7 @@ template =
           "@theia/terminal": "latest",
           "@theia/userstorage": "latest",
           "@theia/variable-resolver": "latest",
+          "@theia/vsx-registry": "latest",
           "@theia/workspace": "latest"
       },
       "resolutions": {
@@ -226,7 +287,7 @@ template =
           "vscode-java-dependency-viewer": "https://github.com/microsoft/vscode-java-dependency/releases/download/0.6.0/vscode-java-dependency-0.6.0.vsix",
           "vscode-java-redhat": "https://github.com/redhat-developer/vscode-java/releases/download/v0.54.2/redhat.java-0.54.2.vsix",
           "vscode-java-test": "https://github.com/microsoft/vscode-java-test/releases/download/0.22.0/vscjava.vscode-java-test-0.22.0.vsix",
-          "vscode-python": "https://github.com/microsoft/vscode-python/releases/download/2020.1.58038/ms-python-release.vsix",
+          "vscode-python": "https://github.com/microsoft/vscode-python/releases/download/2020.4.74986/ms-python-release.vsix",
           "vscode-ruby": "https://github.com/rubyide/vscode-ruby/releases/download/v0.25.0/ruby-0.25.0.vsix",
           "vscode-zc-buildout": "https://github.com/perrinjerome/vscode-zc-buildout/releases/download/v0.2.0/vscode-zc-buildout-0.2.0.vsix"
       }
@@ -257,6 +318,8 @@ install +=
   github.com/haya14busa/goplay/cmd/goplay
   github.com/davidrjenni/reftools/cmd/fillstruct
 
+[cli-utilities]
+PATH = ${nodejs:location}/bin/:${bash:location}/bin/:${fish-shell:location}/bin/:${tig:location}/bin/:${vim:location}/bin/:${tmux:location}/bin/:${git:location}/bin/:${curl:location}/bin
 
 [theia-wrapper]
 recipe = slapos.recipe.template:jinja2
@@ -265,10 +328,9 @@ mode = 0777
 template =
   inline:
   #!/bin/bash
-  export PATH=${nodejs:location}/bin/:${python-language-server:location}/bin/:${bash:location}/bin/:${git:location}/bin/:$PATH
   . ${gowork:env.sh}
+  export PATH=${python-language-server:location}/bin/:${cli-utilities:PATH}:$PATH
   export THEIA_DEFAULT_PLUGINS="local-dir:${theia:THEIA_DEFAULT_PLUGINS}"
-  export SHELL=bash
   # reset PS1 from gowork
   export PS1='$ '
   cd ${theia:location}

software/theia/test/setup.py

@@ -45,6 +45,7 @@ setup(
         'slapos.libnetworkcache',
         'erp5.util',
         'supervisor',
+        'pexpect',
         'requests',
     ],
     zip_safe=True,

software/theia/test/test.py

@@ -24,25 +24,27 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+from __future__ import unicode_literals
 
 import os
 import textwrap
 import logging
 import tempfile
 import time
-from six.moves.urllib.parse import urlparse
+from six.moves.urllib.parse import urlparse, urljoin
 
+import pexpect
 import requests
 
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
-
 setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
     os.path.abspath(
         os.path.join(os.path.dirname(__file__), '..', 'software.cfg')))
 
 
 class TestTheia(SlapOSInstanceTestCase):
+  __partition_reference__ = 'T' # for sockets in included slapos
   def setUp(self):
     self.connection_parameters = self.computer_partition.getConnectionParameterDict()
 
@@ -52,12 +54,71 @@ class TestTheia(SlapOSInstanceTestCase):
 
     # with login/password, this is allowed
     parsed_url = urlparse(self.connection_parameters['url'])
+    authenticated_url = parsed_url._replace(
+        netloc='{}:{}@[{}]:{}'.format(
+            self.connection_parameters['username'],
+            self.connection_parameters['password'],
+            parsed_url.hostname,
+            parsed_url.port,
+        )).geturl()
+    resp = requests.get(authenticated_url, verify=False)
+    self.assertEqual(requests.codes.ok, resp.status_code)
+
+    # there's a public folder to serve file
+    with open('{}/srv/frontend-static/public/test_file'.format(
+        self.computer_partition_root_path), 'w') as f:
+      f.write("hello")
+    resp = requests.get(urljoin(authenticated_url, '/public/'), verify=False)
+    self.assertIn('test_file', resp.text)
     resp = requests.get(
-        parsed_url._replace(
-            netloc='{}:{}@[{}]:{}'.format(
-                self.connection_parameters['username'],
-                self.connection_parameters['password'],
-                parsed_url.hostname,
-                parsed_url.port)).geturl(),
-        verify=False)
+        urljoin(authenticated_url, '/public/test_file'), verify=False)
+    self.assertEqual('hello', resp.text)
+
+    # there's a (not empty) favicon
+    resp = requests.get(
+        urljoin(authenticated_url, '/favicon.ico'), verify=False)
     self.assertEqual(requests.codes.ok, resp.status_code)
+    self.assertTrue(resp.raw)
+
+  def test_theia_slapos(self):
+    # Make sure we can use the shell and the integrated slapos command
+    process = pexpect.spawnu(
+        '{}/bin/theia-shell'.format(self.computer_partition_root_path),
+        env={'HOME': self.computer_partition_root_path})
+
+    # use a large enough terminal so that slapos proxy show table fit in the screen
+    process.setwinsize(5000, 5000)
+
+    process.expect_exact('Standalone SlapOS: Formatting 20 partitions')
+    process.expect_exact('Standalone SlapOS for computer `local` activated')
+
+    # try to supply and install a software to check that this slapos is usable
+    process.sendline(
+        'slapos supply https://lab.nexedi.com/nexedi/slapos/raw/1.0.144/software/helloworld/software.cfg local'
+    )
+    process.expect(
+        'Requesting software installation of https://lab.nexedi.com/nexedi/slapos/raw/1.0.144/software/helloworld/software.cfg...'
+    )
+
+    # we pipe through cat to disable pager and prevent warnings like
+    # WARNING: terminal is not fully functional
+    process.sendline('slapos proxy show | cat')
+    process.expect(
+        'https://lab.nexedi.com/nexedi/slapos/raw/1.0.144/software/helloworld/software.cfg'
+    )
+
+    process.sendline('slapos node software')
+    process.expect(
+        'Installing software release https://lab.nexedi.com/nexedi/slapos/raw/1.0.144/software/helloworld/software.cfg'
+    )
+    # interrupt this, we don't want to actually wait for software installation
+    process.sendcontrol('c')
+
+    # shutdown this slapos
+    process.sendline(
+        'supervisorctl -c {}/srv/slapos/etc/supervisord.conf shutdown'.format(
+            self.computer_partition_root_path))
+    process.expect('Shut down')
+
+    process.terminate()
+    process.wait()

stack/cloudooo.cfg

@@ -9,6 +9,7 @@ extends =
   ../component/dbus/buildout.cfg
   ../component/dcron/buildout.cfg
   ../component/file/buildout.cfg
+  ../component/fontconfig/buildout.cfg
   ../component/fonts/buildout.cfg
   ../component/git/buildout.cfg
   ../component/glib/buildout.cfg
@@ -44,13 +45,6 @@ parts =
   libSM
   libXrender
 
-# fonts
-  liberation-fonts
-  ipaex-fonts
-  ipa-fonts
-  ocrb-fonts
-  android-fonts
-
 # Dependencies
   cups
   dbus
@@ -68,7 +62,6 @@ parts =
 
   rdiff-backup
   apache
-  apache-antiloris
   haproxy
   cloudooo-develop
   cloudooo

stack/erp5/buildout.cfg

@@ -59,8 +59,6 @@ parts +=
   erp5-util-develop
   slapos-cookbook
   rdiff-backup
-  aspell-en-dictionary
-  apache-antiloris
   mroonga-mariadb
   tesseract
   tesseract-eng-traineddata
@@ -73,13 +71,6 @@ parts +=
   testrunner
   test_suite_runner
 
-# fonts
-  liberation-fonts
-  ipaex-fonts
-  ipa-fonts
-  ocrb-fonts
-  android-fonts
-
 # get git repositories
   genbt5list
 
@@ -106,12 +97,6 @@ rendered = ${buildout:directory}/template-jupyter.cfg
 <= download-base-neo
 url = ${:_profile_base_location_}/${:filename}
 
-[check-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
-
 [mariadb-start-clone-from-backup]
 <= download-base
 mode = 755
@@ -178,6 +163,8 @@ mode = 640
 context =
     key mariadb_link_binary template-mariadb:link-binary
     key zope_link_binary template-zope:link-binary
+    key zope_fonts template-zope:fonts
+    key zope_fontconfig_includes template-zope:fontconfig-includes
     key apache_location apache:location
     key bin_directory buildout:bin-directory
     key buildout_bin_directory buildout:bin-directory
@@ -204,6 +191,9 @@ context =
     key mariadb_slow_query_report_script mariadb-slow-query-report-script:target
     key mariadb_start_clone_from_backup mariadb-start-clone-from-backup:target
     key mroonga_mariadb_install_sql mroonga-mariadb:install-sql
+    key mroonga_mariadb_plugin_dir mroonga-mariadb:plugin-dir
+    key groonga_plugin_dir groonga:groonga-plugin-dir
+    key groonga_mysql_normalizer_plugin_dir groonga-normalizer-mysql:groonga-plugin-dir
     key matplotlibrc_location matplotlibrc:location
     key parts_directory buildout:parts-directory
     key openssl_location openssl:location
@@ -232,6 +222,7 @@ context =
     key template_zeo template-zeo:target
     key template_zope template-zope:target
     key template_zope_conf template-zope-conf:target
+    key template_fonts_conf template-fonts-conf:output
     key userhosts_location userhosts:location
     key unixodbc_location unixodbc:location
     key wget_location wget:location
@@ -246,7 +237,7 @@ context =
 [template-zope]
 <= download-base
 link-binary =
-  ${aspell:location}/bin/aspell
+  ${aspell-en-dictionary:bin-aspell}
   ${dmtx-utils:location}/bin/dmtxwrite
   ${git:location}/bin/git
   ${graphviz:location}/bin/dot
@@ -264,6 +255,15 @@ link-binary =
   ${sed:location}/bin/sed
   ${tesseract:location}/bin/tesseract
   ${w3m:location}/bin/w3m
+fonts =
+  ${liberation-fonts:location}
+  ${ipaex-fonts:location}
+  ${ipa-fonts:location}
+  ${ocrb-fonts:location}
+  ${android-fonts:location}
+fontconfig-includes =
+  ${fontconfig:location}/etc/fonts/conf.d
+
 
 [template-balancer]
 <= download-base
@@ -327,12 +327,10 @@ entry-points =
   runUnitTest=runUnitTest:main
 scripts = runUnitTest
 initialization =
-  import glob, imp, os, sys
-  import App # prevent Testing from importing Zope2.App instead of App
+  import glob, os, sys
   import Products
   Products.__path__[:0] = filter(None,
     os.getenv('INSERT_PRODUCTS_PATH', '').split(os.pathsep))
-  os.environ['SOFTWARE_HOME'] = os.path.abspath(imp.find_module('Zope2')[1])
   os.environ['ZOPE_SCRIPTS'] = ''
   parts_directory = '''${buildout:parts-directory}'''
   repository_id_list = \
@@ -365,8 +363,6 @@ initialization =
   import sys
   import Products
   [Products.__path__.insert(0, p) for p in reversed(os.environ.get('INSERT_PRODUCTS_PATH', '').split(':')) if p]
-  import Zope2
-  os.environ['SOFTWARE_HOME'] = os.path.abspath(os.path.dirname(os.path.dirname(Zope2.__file__)))
   os.environ['ZOPE_SCRIPTS'] = ''
   repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split()))
   sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list]
@@ -733,7 +729,6 @@ zope.app.dependable = 3.5.1
 zope.app.form = 4.0.2
 
 et-xmlfile = 1.0.1
-more-itertools = 5.0.0
 h5py = 2.7.1
 mpmath = 0.19
 openpyxl = 2.4.8
@@ -763,8 +758,6 @@ parso = 0.5.1
 
 yapf = 0.28.0
 
-typing = 3.7.4.1
-
 # Required by:
 # erp5.util==0.4.65
 z3c.etestbrowser = 3.0.1

stack/erp5/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = d10b8e35b02b5391cf46bf0c7dbb1196
 
 [template-mariadb]
 filename = instance-mariadb.cfg.in
-md5sum = 63bac9fc58537e55a6c8c42d0be54fbe
+md5sum = bfed6ac56c3ba0e96be4c9474dac6f20
 
 [template-kumofs]
 filename = instance-kumofs.cfg.in
@@ -42,7 +42,7 @@ md5sum = d32417746fcf671d4e86a70379815039
 
 [template-my-cnf]
 filename = my.cnf.in
-md5sum = 771bfd921aa5e59e1b4712ba113fa84b
+md5sum = 7944ec58a2c6ee74a56219bacebfd145
 
 [template-mariadb-initial-setup]
 filename = mariadb_initial_setup.sql.in
@@ -70,7 +70,7 @@ md5sum = cc19560b9400cecbd23064d55c501eec
 
 [template]
 filename = instance.cfg.in
-md5sum = 1a218a5676208dda092e6045f25bf77f
+md5sum = e19aaec1878f40bf4ddb4c45a4470b21
 
 [monitor-template-dummy]
 filename = dummy.cfg
@@ -86,7 +86,7 @@ md5sum = 0648e38bd5d3a15bb9f93264932740b9
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = e9032f39c6e5db684342491fdeb4624c
+md5sum = 2f3ddd328ac1c375e483ecb2ef5ffb57
 
 [template-balancer]
 filename = instance-balancer.cfg.in

stack/erp5/instance-mariadb.cfg.in

@@ -129,6 +129,8 @@ socket = ${directory:run}/mariadb.sock
 data-directory = ${directory:srv}/mariadb
 tmp-directory = ${directory:tmp}
 etc-directory = ${directory:etc}
+plugin-directory = {{ dumps(parameter_dict['mroonga-mariadb-plugin-dir']) }}
+groonga-plugins-path = {{ parameter_dict['groonga-plugins-path'] }}
 pid-file = ${directory:run}/mariadb.pid
 error-log = ${directory:log}/mariadb_error.log
 slow-query-log = ${directory:log}/mariadb_slowquery.log
@@ -186,6 +188,7 @@ context =
   key datadir my-cnf-parameters:data-directory
   key environ :environ
 environ =
+  GRN_PLUGINS_PATH='${my-cnf-parameters:groonga-plugins-path}'
   ODBCSYSINI='${my-cnf-parameters:etc-directory}'
   LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}'{{ parameter_dict['unixodbc-location'] }}/lib'
   {%- for variable in slapparameter_dict.get('environment-variables', ()) %}
@@ -242,7 +245,7 @@ command = mysql_tzinfo_to_sql
 <= binary-wrap-base
 command-line = "{{ parameter_dict['percona-tools-location'] }}/bin/${:command}"
 command = pt-query-digest
- 
+
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -319,7 +322,7 @@ template = {{ parameter_dict['mariadb-slow-query-report-script'] }}
 rendered = ${directory:bin}/${:filename}
 filename = generate-mariadb-slow-query-report
 mode = 755
-context = 
+context =
   raw slow_query_path ${directory:srv}/backup/logrotate/mariadb_slowquery.log
   raw pt_query_exec ${binary-wrap-pt-digest:wrapper-path}
   raw dash {{ parameter_dict['dash-location'] }}/bin/dash

stack/erp5/instance-zope.cfg.in

@@ -58,6 +58,7 @@ environment +=
   MATPLOTLIBRC={{ parameter_dict['matplotlibrc'] }}
   INSTANCE_HOME=${:instance-home}
   CAUCASE={{ slapparameter_dict['caucase-url'] }}
+  FONTCONFIG_FILE=${fontconfig-conf:rendered}
 {% if slapparameter_dict.get('wendelin-core-zblk-fmt') %}
   WENDELIN_CORE_ZBLK_FMT={{ slapparameter_dict['wendelin-core-zblk-fmt'] }}
 {% endif %}
@@ -88,6 +89,24 @@ tmp = ${buildout:directory}/tmp
 var = ${buildout:directory}/var
 plugin = ${:etc}/plugin
 unit-test-path = ${:srv}/test-instance/unit_test
+fontconfig-cache = ${buildout:directory}/.fontconfig
+
+[fontconfig-conf]
+recipe = slapos.recipe.template:jinja2
+template = {{ parameter_dict['template-fonts-conf'] }}
+rendered = ${directory:etc}/fonts.conf
+context =
+    key cachedir directory:fontconfig-cache
+    key fonts :fonts
+    key includes :includes
+fonts =
+{% for font in parameter_dict['fonts'].splitlines() %}
+   {{ font }}
+{% endfor %}
+includes =
+{% for include in parameter_dict['fontconfig-includes'].splitlines() %}
+   {{ include }}
+{% endfor %}
 
 # Used for ERP5 resiliency or (more probably)
 # webrunner resiliency with erp5 inside.
@@ -308,7 +327,7 @@ node-id = {{ dumps(node_id_base ~ (node_id_index_format % index)) }}
 {% endfor -%}
 import-list = {{ dumps(list(import_set)) }}
 zodb-dict = {{ dumps(zodb_dict) }}
-large-file-threshold = {{ large_file_threshold }} 
+large-file-threshold = {{ large_file_threshold }}
 {% if longrequest_logger_interval > 0 -%}
 longrequest-logger-file = {{ longrequest_logger_base_path ~ name ~ ".log" }}
 longrequest-logger-timeout = {{ longrequest_logger_timeout }}

stack/erp5/instance.cfg.in

@@ -99,6 +99,9 @@ perl_dbd_mariadb_path = {{ perl_dbd_mariadb_path }}
 dash = {{ dash_location }}
 jsl = {{ jsl_location }}
 link-binary = {{ dumps(zope_link_binary) }}
+fonts = {{ dumps(zope_fonts) }}
+fontconfig-includes = {{ dumps(zope_fontconfig_includes) }}
+template-fonts-conf = {{ dumps(template_fonts_conf) }}
 userhosts = {{ userhosts_location }}
 site-zcml = {{ site_zcml }}
 extra-path-list = {{ dumps(extra_path_list) }}
@@ -152,6 +155,8 @@ promise-check-slow-queries-digest-result = {{ bin_directory }}/check-slow-querie
 percona-tools-location = {{ percona_toolkit_location }}
 unixodbc-location = {{ unixodbc_location }}
 mroonga-mariadb-install-sql = {{ mroonga_mariadb_install_sql }}
+mroonga-mariadb-plugin-dir = {{ mroonga_mariadb_plugin_dir }}
+groonga-plugins-path = {{ groonga_plugin_dir }}:{{ groonga_mysql_normalizer_plugin_dir }}
 
 [dynamic-template-mariadb]
 <= jinja2-template-base

stack/erp5/my.cnf.in

@@ -32,6 +32,7 @@ innodb_file_per_table = {{ parameter_dict['innodb-file-per-table'] }}
 default_time_zone = '+00:00'
 
 plugin_load = ha_mroonga
+plugin-dir = {{ parameter_dict['plugin-directory'] }}
 
 max_connections = {{ parameter_dict['max-connection-count'] }}
 

stack/erp5/zope-versions.cfg

 [versions]
-Zope2 = 2.13.29
+Zope2 = 2.13.30
 AccessControl = 2.13.16
 Acquisition = 2.13.12
 DateTime = 2.12.8
-DocumentTemplate = 2.13.4
+DocumentTemplate = 2.13.6
 ExtensionClass = 2.13.2
 Jinja2 = 2.8.1
+MarkupSafe = 1.1.1
 Missing = 2.13.1
 MultiMapping = 2.13.0
 Paste = 1.7.5.1
@@ -15,7 +16,7 @@ Persistence = 2.13.2
 Products.BTreeFolder2 = 2.13.5
 Products.ExternalMethod = 2.13.1
 Products.MIMETools = 2.13.0
-Products.MailHost = 2.13.2
+Products.MailHost = 2.13.4
 Products.OFSP = 2.13.2
 Products.PythonScripts = 2.13.2
 Products.Sessions = 3.0
@@ -23,7 +24,6 @@ Products.StandardCacheManagers = 2.13.1
 Products.TemporaryFolder = 3.0
 Products.ZCTextIndex = 2.13.5
 Products.ZCatalog = 2.13.30
-Pygments = 2.3.1
 Record = 2.13.0
 RestrictedPython = 3.6.0
 Sphinx = 1.0.8
@@ -31,22 +31,35 @@ ZConfig = 2.9.3
 ZODB3 = 3.10.7
 ZServer = 3.0
 ZopeUndo = 2.12.0
+appdirs = 1.4.3
+configparser = 4.0.2
+contextlib2 = 0.6.0.post1
+distlib = 0.3.0
 docutils = 0.12
-filelock = 3.0.10
+filelock = 3.0.12
+importlib-metadata = 1.3.0
+importlib-resources = 1.0.2
 initgroups = 2.13.0
 mechanize = 0.2.5
+more-itertools = 5.0.0
 mr.developer = 1.34
-pluggy = 0.8.1
-py = 1.7.0
+packaging = 20.1
+pathlib2 = 2.3.5
+pluggy = 0.13.1
+py = 1.8.1
+pyparsing = 2.4.6
 pytz = 2017.2
 repoze.retry = 1.2
 repoze.tm2 = 1.0
 repoze.who = 2.0
-six = 1.12.0
+scandir = 1.10.0
+six = 1.14.0
 tempstorage = 2.12.2
 toml = 0.10.0
-tox = 3.7.0
+tox = 3.14.4
 transaction = 1.1.1
+typing = 3.7.4.1
+virtualenv = 20.0.4
 z3c.checkversions = 1.1
 zExceptions = 2.13.0
 zLOG = 2.11.2
@@ -55,6 +68,7 @@ zc.lockfile = 1.0.2
 zc.recipe.egg = 2.0.5
 zc.recipe.testrunner = 1.2.1
 zdaemon = 2.0.7
+zipp = 0.6.0
 zope.annotation = 3.5.0
 zope.broken = 3.6.0
 zope.browser = 1.3

stack/lamp/buildout.cfg

@@ -20,11 +20,8 @@ parts =
 
 extends =
   buildout.hash.cfg
-  ../../component/apache-php/buildout.cfg
-  ../../component/apache/buildout.cfg
   ../../component/curl/buildout.cfg
   ../../component/dash/buildout.cfg
-  ../../component/dash/buildout.cfg
   ../../component/dropbear/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/glib/buildout.cfg
@@ -38,6 +35,7 @@ extends =
   ../logrotate/buildout.cfg
   ../resilient/buildout.cfg
   ../erp5/buildout.cfg
+  ../../component/apache-php/buildout.cfg
 
   ../slapos.cfg
 
@@ -104,6 +102,9 @@ context =
     key mariadb_slow_query_report_script mariadb-slow-query-report-script:target
     key mariadb_start_clone_from_backup mariadb-start-clone-from-backup:target
     key mroonga_mariadb_install_sql mroonga-mariadb:install-sql
+    key mroonga_mariadb_plugin_dir mroonga-mariadb:plugin-dir
+    key groonga_plugin_dir groonga:groonga-plugin-dir
+    key groonga_mysql_normalizer_plugin_dir groonga-normalizer-mysql:groonga-plugin-dir
     key percona_toolkit_location percona-toolkit:location
     key template_php_ini template-php.ini:output
     key template_apache_conf template-apache.conf:output

stack/lamp/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [instance]
 filename = instance.cfg.in
-md5sum = 92a93bb3b9f6663d967b0fb57244a1fa
+md5sum = 6efa60dd898d3cd568afb4a47b94d573
 
 [instance-apache-php]
 filename = instance-apache-php.cfg.in

stack/lamp/instance.cfg.in

@@ -90,6 +90,8 @@ promise-check-slow-queries-digest-result = {{ bin_directory }}/check-slow-querie
 percona-tools-location = {{ percona_toolkit_location }}
 unixodbc-location = {{ unixodbc_location }}
 mroonga-mariadb-install-sql = {{ mroonga_mariadb_install_sql }}
+mroonga-mariadb-plugin-dir = {{ mroonga_mariadb_plugin_dir }}
+groonga-plugins-path = {{ groonga_plugin_dir }}:{{ groonga_mysql_normalizer_plugin_dir }}
 check-computer-memory-binary = {{ bin_directory }}/check-computer-memory
 bin-directory = {{ bin_directory }}
 

stack/monitor/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 84bc2cf29e34b48c51116d93e2be7636
 
 [monitor-httpd-conf]
 _update_hash_filename_ = templates/monitor-httpd.conf.in
-md5sum = b5f42503799e7e770afce4097d3b75ae
+md5sum = 0540fc5cc439a06079e9e724a5a55a70
 
 [monitor-template-wrapper]
 _update_hash_filename_ = templates/wrapper.in

stack/monitor/templates/monitor-httpd.conf.in

@@ -8,12 +8,13 @@ ThreadsPerChild 4
 
 ServerName example.com
 ServerAdmin someone@email
-<IfDefine !MonitorPort>
 Listen [{{ parameter_dict.get('listening-ip') }}]:{{ parameter_dict.get('port') }}
-Define MonitorPort
-</IfDefine>
 DocumentRoot "{{ directory.get('private') }}"
 ErrorLog "{{ parameter_dict.get('error-log') }}"
+LogFormat "%h %l %u %t \"%r\" %>s %b" common
+CustomLog "{{ parameter_dict.get('access-log') }}" common
+
+LoadModule log_config_module modules/mod_log_config.so
 LoadModule unixd_module modules/mod_unixd.so
 LoadModule access_compat_module modules/mod_access_compat.so
 LoadModule authz_core_module modules/mod_authz_core.so

stack/slapos.cfg

@@ -153,7 +153,7 @@ pyparsing = 2.2.0
 pytz = 2016.10
 requests = 2.13.0
 six = 1.12.0
-slapos.cookbook = 1.0.145
+slapos.cookbook = 1.0.146
 slapos.core = 1.5.12
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
@@ -212,7 +212,7 @@ enum34 = 1.1.6
 
 # Required by:
 # slapos.toolbox==0.94
-erp5.util = 0.4.66
+erp5.util = 0.4.67
 
 # Required by:
 # slapos.toolbox==0.94