Update Release Candidate

31d966c1 · Jérome Perrin · b0ad4d1b · e61a927a · 31d966c1 · 31d966c1
Commit 31d966c1 authored Nov 11, 2022 by Jérome Perrin
64 changed files
--- a/component/curl/buildout.cfg
+++ b/component/curl/buildout.cfg
 # libcurl - the multiprotocol file transfer library
-# http://curl.haxx.se/
+# https://curl.se/

 [buildout]
 extends =
@@ -17,8 +17,8 @@ parts =
 [curl]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://curl.haxx.se/download/curl-7.79.1.tar.xz
-md5sum = 74d3c4ca8aaa6c0619806d6e246e65fb
+url = https://curl.se/download/curl-7.86.0.tar.xz
+md5sum = 19a2165f37941a6f412afc924e750568
 configure-options =
  --disable-static
  --disable-ech

--- a/component/git/buildout.cfg
+++ b/component/git/buildout.cfg
@@ -18,8 +18,8 @@ parts =
 [git]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.37.0.tar.xz
-md5sum = 9716e2b4be3f9e1105f23aa1f80a37e4
+url = https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.38.1.tar.xz
+md5sum = abdafbfb85d205421903a2100c734b17
 configure-options =
  --with-curl=${curl:location}
  --with-openssl=${openssl:location}

--- a/component/theia/buildout.hash.cfg
+++ b/component/theia/buildout.hash.cfg
@@ -19,7 +19,7 @@ md5sum = 8157c22134200bd862a07c6521ebf799

 [yarn.lock]
 _update_hash_filename_ = yarn.lock
-md5sum = f961f8ef90e9a02543b4231af4fbd5cc
+md5sum = 3b8ac3a6933a1d52b31c74fad8af2d8e

 [ms-python-disable-jedi-buildout.patch]
 _update_hash_filename_ = ms-python-disable-jedi-buildout.patch

--- a/component/theia/download-plugins.cfg
+++ b/component/theia/download-plugins.cfg
--- a/component/theia/generate_download_plugins_cfg.py
+++ b/component/theia/generate_download_plugins_cfg.py
@@ -17,6 +17,7 @@ for plugin_and_version in '''\
    vscode/docker/latest
    vscode/emmet/latest
    vscode/fsharp/latest
+    vscode/git-base/latest
    vscode/git/latest
    vscode/go/latest
    vscode/groovy/latest

--- a/component/theia/yarn.lock
+++ b/component/theia/yarn.lock
--- a/software/beremiz-ide/buildout.hash.cfg
+++ b/software/beremiz-ide/buildout.hash.cfg
@@ -19,7 +19,7 @@ md5sum = db7fe97f4c6b84cfadb7b5c68eab517a

 [template-instance-beremiz]
 filename = instance-beremiz.cfg.jinja2.in
-md5sum = c92317d0d754f62d3259136d1a0df1ac
+md5sum = 9d59c9392636ab71f37b43fd8008fd10

 [template-instance-beremiz-test]
 filename = instance-beremiz-test.cfg.jinja2.in

--- a/software/beremiz-ide/instance-beremiz.cfg.jinja2.in
+++ b/software/beremiz-ide/instance-beremiz.cfg.jinja2.in
@@ -213,7 +213,7 @@ output = ${directory:bin}/xterm
 [request-vnc-frontend]
 <= slap-connection
 recipe = slapos.cookbook:requestoptional
-slave = true
+shared = true
 config-https-only = True
 config-type = websocket
 config-url = https://[${novnc-instance:ip}]:${novnc-instance:port}

--- a/software/caddy-frontend/buildout.hash.cfg
+++ b/software/caddy-frontend/buildout.hash.cfg
@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68

 [profile-frontend]
 filename = instance-frontend.cfg.in
-md5sum = 0ec59d2fb5617e82d1848c1170772d84
+md5sum = ae04e2c6137cb5bd5ef1a9b3c6738c49

 [profile-master]
 filename = instance-master.cfg.in

--- a/software/caddy-frontend/instance-frontend.cfg.in
+++ b/software/caddy-frontend/instance-frontend.cfg.in
@@ -969,7 +969,7 @@ extra-context =
 recipe = slapos.cookbook:requestoptional
 name = Slave Introspection Frontend {{ instance_parameter_dict['configuration.frontend-name'] }}
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = https://[${slap-configuration:ipv6-random}]:{{ instance_parameter_dict['configuration.slave-introspection-https-port'] }}/
 config-https-only = true
 return = domain secure_access
@@ -979,7 +979,7 @@ return = domain secure_access
 recipe = slapos.cookbook:requestoptional
 name = Backend Haproxy Statistic Frontend {{ instance_parameter_dict['configuration.frontend-name'] }}
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = https://[${slap-configuration:ipv6-random}]:{{ instance_parameter_dict['configuration.backend-haproxy-statistic-port'] }}/
 config-https-only = true
 return = domain secure_access

--- a/software/dufs/buildout.hash.cfg
+++ b/software/dufs/buildout.hash.cfg
@@ -15,4 +15,4 @@

 [instance.cfg.in]
 filename = instance.cfg.in
-md5sum = 9553d3f24d4201d3320408d8a3154049
+md5sum = 0cb3cbac5479581985e5446078217686
--- a/software/dufs/instance.cfg.in
+++ b/software/dufs/instance.cfg.in
@@ -165,7 +165,7 @@ recipe = slapos.cookbook:requestoptional
 name = dufs Server Frontend
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = ${dufs-server:url}
 return = domain secure_access


--- a/software/erp5testnode/buildout.hash.cfg
+++ b/software/erp5testnode/buildout.hash.cfg
@@ -18,4 +18,4 @@ md5sum = 5bd72da73a8b84f70f568686924d7d6c

 [template-default]
 filename = instance-default.cfg.jinja.in
-md5sum = 0c9ea9fa7417885889a536ec2cf2093f
+md5sum = 2aafd7708aac85847da3a8679b84fe34
--- a/software/erp5testnode/instance-default.cfg.jinja.in
+++ b/software/erp5testnode/instance-default.cfg.jinja.in
@@ -236,7 +236,7 @@ output = $${directory:srv}/exporter.exclude
 recipe = slapos.cookbook:requestoptional
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-https-only = true
 return = domain secure_access


--- a/software/grafana/buildout.hash.cfg
+++ b/software/grafana/buildout.hash.cfg
@@ -15,7 +15,7 @@

 [instance-profile]
 filename = instance.cfg.in
-md5sum = 6fb42f5663864789ff7b375a9a86888e
+md5sum = 94674d597e3ea7e9eca3637a737765ff

 [influxdb-config-file]
 filename = influxdb-config-file.cfg.in

--- a/software/grafana/instance.cfg.in
+++ b/software/grafana/instance.cfg.in
@@ -263,7 +263,7 @@ recipe = slapos.cookbook:requestoptional
 name = Grafana Frontend
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = ${grafana:url}
 config-https-only = true
 return = domain secure_access

--- a/software/headless-chromium/buildout.hash.cfg
+++ b/software/headless-chromium/buildout.hash.cfg
@@ -4,7 +4,7 @@ md5sum = 6315598b2c7c19f9e2d9cdf090492e2c

 [instance-headless-chromium]
 _update_hash_filename_ = instance-headless-chromium.cfg.in
-md5sum = a350b7b5ac03971f1b8d66949905c164
+md5sum = feaef60353c94e02d38cfec66f0eb861

 [template-nginx-conf]
 _update_hash_filename_ = templates/nginx.conf.in

--- a/software/headless-chromium/instance-headless-chromium.cfg.in
+++ b/software/headless-chromium/instance-headless-chromium.cfg.in
@@ -153,7 +153,7 @@ password = ${frontend-instance-password:passwd}
 recipe = slapos.cookbook:requestoptional
 name = Headless Chromium Remote Debugging Frontend
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = https://${headless-chromium:proxy-address}
 config-https-only = true
 config-type = websocket

--- a/software/html5as/buildout.hash.cfg
+++ b/software/html5as/buildout.hash.cfg
@@ -21,7 +21,7 @@ md5sum = 23c15a579b66cef866b30a2f53b1b737

 [instance_html5as]
 _update_hash_filename_ = instance_html5as.cfg.in
-md5sum = fc1dd9faf99a4f75e3727b80bb2d59fb
+md5sum = 0b16e9a2cac16668e100687f19430b1e

 [template_nginx_conf]
 _update_hash_filename_ = templates/nginx_conf.in

--- a/software/html5as/instance_html5as.cfg.in
+++ b/software/html5as/instance_html5as.cfg.in
@@ -221,7 +221,7 @@ name = HTML5AS frontend
 # Specify the software url of the frontend software release
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
 # It is not a dedicated instance but an instance allocated on a shared instance
-slave = true
+shared = true
 config-url = ${html5as:access_url}
 config-https-only = true
 # The parameter expected to be received from the request are listed here.

--- a/software/hugo/buildout.hash.cfg
+++ b/software/hugo/buildout.hash.cfg
@@ -15,7 +15,7 @@

 [template-cfg]
 filename = instance.cfg.in
-md5sum = 34f7ab6fe20f685d7d03f2e36f3be207
+md5sum = edddaa4f6145f3eab4463063dacacfaa

 [template_nginx_conf]
 _update_hash_filename_ = templates/nginx_conf.in

--- a/software/hugo/instance.cfg.in
+++ b/software/hugo/instance.cfg.in
@@ -137,7 +137,7 @@ monitor-httpd-port = ${slap-configuration:configuration.hugo-monitor-httpd-port}
 recipe = slapos.cookbook:requestoptional
 name = Hugo frontend
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = ${hugo:hugo-access-url}
 config-https-only = true
 return = domain secure_access
@@ -229,7 +229,7 @@ post = kill -USR1 $(cat ${hugo:path-pid})
 recipe = slapos.cookbook:requestoptional
 name = Hugo Nginx frontend
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = ${hugo:nginx-access-url}
 config-https-only = true
 return = domain secure_access

--- a/software/jscrawler/buildout.hash.cfg
+++ b/software/jscrawler/buildout.hash.cfg
@@ -19,7 +19,7 @@ md5sum = 7333d1dfd4e8e4c375f7f1748292f554

 [template-jscrawler]
 filename = instance-jscrawler.cfg.jinja2.in
-md5sum = ae9269ab5b1cce77016f822024d2d996
+md5sum = 2ba9d6a30b420c9bf67d4a135b48212b

 [template-jscrawler-builder]
 filename = template-jscrawler.builder.sh.in

--- a/software/jscrawler/instance-jscrawler.cfg.jinja2.in
+++ b/software/jscrawler/instance-jscrawler.cfg.jinja2.in
@@ -41,7 +41,7 @@ recipe = slapos.cookbook:requestoptional
 name = jscawler Frontend
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = https://[${httpd-wrapper:host}]:${httpd-wrapper:port}
 return = secure_access domain


--- a/software/jupyter/buildout.hash.cfg
+++ b/software/jupyter/buildout.hash.cfg
@@ -19,7 +19,7 @@ md5sum = 5f39952f94095b1f12f41db76867e71e

 [instance-jupyter]
 filename = instance-jupyter.cfg.in
-md5sum = ee2fbb01b4143c19fa16f8449ca4ec29
+md5sum = 1ac942c544d2a2aa3d1e16a61a1f8bc8

 [jupyter-notebook-config]
 filename = jupyter_notebook_config.py.jinja

--- a/software/jupyter/instance-jupyter.cfg.in
+++ b/software/jupyter/instance-jupyter.cfg.in
@@ -127,7 +127,7 @@ key-file = ${slap-connection:key-file}
 cert-file = ${slap-connection:cert-file}
 computer-id = ${slap-connection:computer-id}
 partition-id = ${slap-connection:partition-id}
-slave = true
+shared = true
 config-type = notebook
 config-url = https://[${instance-parameter:host}]:${instance-parameter:port}
 return = secure_access

--- a/software/kvm/buildout.hash.cfg
+++ b/software/kvm/buildout.hash.cfg
@@ -19,11 +19,11 @@ md5sum = a7978940fb9cdcc4e1ec33015ba640ba

 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = d790827b6199aa5aada5fe7acb8f1a7b
+md5sum = 69749ef4be49b970af9548d68e6d8785

 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
-md5sum = 4919254d85b98659c1be2ae631b99a13
+md5sum = 15415f63741dc8c478512f9e410bb0ae

 [template-kvm-resilient]
 filename = instance-kvm-resilient.cfg.jinja2

--- a/software/kvm/instance-kvm-cluster.cfg.jinja2.in
+++ b/software/kvm/instance-kvm-cluster.cfg.jinja2.in
@@ -219,7 +219,7 @@ recipe = slapos.cookbook:request
 software-url = {{ slave_frontend_sr }}
 name = Frontend {{ name }}
 software-type = {{ slave_frontend_stype }}
-slave = true
+shared = true
 config-url = {{ url }}
 {{ setconfig('custom_domain', kvm_parameter_dict.get('domain', '')) }}
 config-enable_cache = {{ dumps(frontend_parameter_dict.get('enable-cache', False)) }}

--- a/software/kvm/instance-kvm.cfg.jinja2
+++ b/software/kvm/instance-kvm.cfg.jinja2
@@ -745,7 +745,7 @@ key-file = ${slap-connection:key-file}
 cert-file = ${slap-connection:cert-file}
 computer-id = ${slap-connection:computer-id}
 partition-id = ${slap-connection:partition-id}
-slave = true
+shared = true
 config-https-only = True
 config-type = websocket
 config-url = https://[${novnc-instance:ip}]:${novnc-instance:port}

--- a/software/repman/buildout.hash.cfg
+++ b/software/repman/buildout.hash.cfg
@@ -18,7 +18,7 @@ md5sum = 55c7fd4dd6a39b31878889fbfb00f995

 [instance-repman.cfg]
 _update_hash_filename_ = instance-repman.cfg.jinja2.in
-md5sum = dc01433ffed82386a3feee0b34767bed
+md5sum = 79e8caeb717277f2e09d54afdeac6398

 [config-toml.in]
 _update_hash_filename_ = templates/config.toml.in

--- a/software/repman/instance-repman.cfg.jinja2.in
+++ b/software/repman/instance-repman.cfg.jinja2.in
@@ -671,7 +671,7 @@ software-url = {{ frontend_parameter_dict.get('frontend-software-url', 'http://g
 {% if frontend_parameter_dict.get('frontend-software-type', '') -%}
 software-type ={{ frontend_parameter_dict['frontend-software-type'] }}
 {% endif -%}
-slave = true
+shared = true
 config-url = ${nginx-parameter:backend-ssl-url}
 config-domain = {{ frontend_parameter_dict.get('slave-domain', '') }}
 return = domain secure_access

--- a/software/restic-rest-server/buildout.hash.cfg
+++ b/software/restic-rest-server/buildout.hash.cfg
@@ -15,4 +15,4 @@

 [instance.cfg.in]
 filename = instance.cfg.in
-md5sum = a5a05e6949d78882bde4d53fb21cdd00
+md5sum = 573e23c88fea6a11ab5c79b1eb106601
--- a/software/restic-rest-server/instance.cfg.in
+++ b/software/restic-rest-server/instance.cfg.in
@@ -177,7 +177,7 @@ recipe = slapos.cookbook:requestoptional
 name = Rest Server Frontend
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = ${rest-server:url}
 return = domain secure_access


--- a/software/slapos-master/buildout.hash.cfg
+++ b/software/slapos-master/buildout.hash.cfg
@@ -14,7 +14,7 @@
 # not need these here).
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = ce9c231ec47eb8f528345add21cb7822
+md5sum = 6d9b94b50ea46b0b98c9019d74780876

 [template-balancer]
 filename = instance-balancer.cfg.in

--- a/software/slapos-master/instance-erp5.cfg.in
+++ b/software/slapos-master/instance-erp5.cfg.in
@@ -465,7 +465,7 @@ recipe = slapos.cookbook:request
 software-url = {{ dumps(frontend_dict['software-url']) }}
 software-type = {{ dumps(frontend_dict.get('software-type', 'RootSoftwareInstance')) }}
 {{ root_common.sla('frontend', True) }}
-slave = true
+shared = true
 {% set config_dict = {
  'type': 'zope',
 } -%}

--- a/software/slaprunner/buildout.hash.cfg
+++ b/software/slaprunner/buildout.hash.cfg
@@ -18,7 +18,7 @@ md5sum = 473325442cba8ee32642d1e5e3fa94f4

 [template-runner]
 filename = instance-runner.cfg
-md5sum = 8d284c9257250afd83a1463662a56d08
+md5sum = 03d3774fcb01a8ec68a23de31fb346b8

 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2

--- a/software/slaprunner/instance-runner.cfg
+++ b/software/slaprunner/instance-runner.cfg
@@ -65,7 +65,7 @@ global-ipv6 = $${slap-configuration:ipv6-random}
 recipe = slapos.cookbook:requestoptional
 software-url = {{ slapparameter_dict.get('custom-frontend-software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg') }}
 software-type = {{ slapparameter_dict.get('custom-frontend-software-type', 'RootSoftwareInstance') }}
-slave = true
+shared = true
 name = Custom Web Frontend

 server-url = $${slap-connection:server-url}
@@ -529,7 +529,7 @@ recipe = slapos.cookbook:requestoptional
 name = SlapRunner Frontend
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = $${slaprunner:access-url}
 config-domain = $${slap-parameter:frontend-domain}
 return = site_url domain
@@ -548,7 +548,7 @@ recipe = slapos.cookbook:requestoptional
 name = Monitor Frontend
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = $${apache-httpd:access-url}
 config-domain =
 return = secure_access domain

--- a/software/theia/buildout.hash.cfg
+++ b/software/theia/buildout.hash.cfg
@@ -15,11 +15,11 @@

 [instance-theia]
 _update_hash_filename_ = instance-theia.cfg.jinja.in
-md5sum = 56ad229756d2d57971c583104370dcc7
+md5sum = 3d00572afdd311ba8b4fc8b6ad0ac4b6

 [instance]
 _update_hash_filename_ = instance.cfg.in
-md5sum = e211c439571e2900f9f35482c9638d06
+md5sum = 08b8aa2b7f59ac0e4e5d4ca180054937

 [instance-import]
 _update_hash_filename_ = instance-import.cfg.jinja.in

--- a/software/theia/instance-input-schema.json
+++ b/software/theia/instance-input-schema.json
@@ -25,6 +25,16 @@
        "{\"software-url\": \"~/srv/project/slapos/software/html5as/software.cfg\", \"software-type\": \"replicate\", \"instance-parameters\": {\"replicate-quantity\": 3}}"
      ]
    },
+    "forward-slapos-frontend-requests": {
+      "title": "Forward Frontend Requests in the Embedded SlapOS",
+      "description": "Embedded SlapOS instance by default forwards frontend requests as shared instances attached to the Theia instance, so that HTTP frontends can be allocated for services. This behavior can be disabled, in that case frontends will not be allocated.",
+      "type": "string",
+      "enum": [
+        "enabled",
+        "disabled"
+      ],
+      "default": "enabled"
+    },
    "frontend-guid": {
      "title": "Frontend Instance ID",
      "description": "Unique identifier of the frontend instance, like \"SOFTINST-11031\".",

--- a/software/theia/instance-theia.cfg.jinja.in
+++ b/software/theia/instance-theia.cfg.jinja.in
@@ -179,7 +179,7 @@ config-command = $${embedded-instance-requested-promise-script:output}
 [remote-frontend-base]
 <= slap-connection
 recipe = slapos.cookbook:requestoptional
-slave = true
+shared = true
 config-url = $${frontend-instance:url}
 config-https-only = true
 config-type = websocket
@@ -535,7 +535,7 @@ context =
  key forward_frontend_requests :forward-frontend-requests
  section slap_connection slap-connection
  section slapos_standalone_config slapos-standalone-config
-forward-frontend-requests = enabled
+forward-frontend-requests = {{ parameter_dict['forward-slapos-frontend-requests'] }}
 url = ${slapos-standalone-script:output}

 [slapos-standalone]

--- a/software/theia/instance.cfg.in
+++ b/software/theia/instance.cfg.in
@@ -45,6 +45,7 @@ default-parameters =
  {
    "autorun": "running",
    "initial-embedded-instance": null,
+    "forward-slapos-frontend-requests": "enabled",
    "frontend-name": "Theia Frontend",
    "frontend-sr": "$${:frontend-sr}",
    "frontend-sr-type": "RootSoftwareInstance",

--- a/software/theia/software.cfg
+++ b/software/theia/software.cfg
@@ -56,7 +56,7 @@ pygls = 0.12:whl
 typeguard = 2.13.3:whl
 typing-extensions = 4.3.0:whl
 yarl = 1.7.2
-zc.buildout.languageserver = 0.8.1
+zc.buildout.languageserver = 0.8.3


 # Downloads and templates
@@ -155,6 +155,7 @@ needs-these-eggs-scripts-in-path =

 [python-for-buildout-languageserver]
 <= python-interpreter
+interpreter = ${:_buildout_section_name_}
 executable = ${buildout:bin-directory}/${:interpreter}
 eggs +=
  zc.buildout.languageserver

--- a/software/theia/test/test.py
+++ b/software/theia/test/test.py
@@ -31,6 +31,7 @@ import logging
 import os
 import re
 import subprocess
+import sqlite3
 import time

 import pexpect
@@ -42,6 +43,7 @@ from six.moves.urllib.parse import urlparse, urljoin

 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass, SlapOSNodeCommandError
 from slapos.grid.svcbackend import getSupervisorRPC, _getSupervisordSocketPath
+from slapos.proxy.db_version import DB_VERSION


 theia_software_release_url = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'software.cfg'))
@@ -356,6 +358,60 @@ class TestTheiaFrontend(TheiaTestCase):
      self.assertEqual(requests.codes.unauthorized, resp.status_code)


+class TestTheiaForwardFrontendRequestsEnabled(TheiaTestCase):
+
+  @classmethod
+  def getInstanceParameterDict(cls):
+    return {"autorun": "user-controlled"} # we interact with slapos in this test
+
+  def _getRequestedInstanceList(self, query):
+    with sqlite3.connect(os.path.join(
+        self.computer_partition_root_path,
+        'srv/runner/var/proxy.db',
+    )) as db:
+      return [row[0] for row in db.execute(query).fetchall()]
+
+  def getRequestedInstanceList(self):
+    return self._getRequestedInstanceList(
+      f"SELECT partition_reference FROM partition{DB_VERSION} where slap_state='busy'"
+    )
+
+  def getForwardedInstanceList(self):
+    return self._getRequestedInstanceList(
+      f"SELECT partition_reference FROM forwarded_partition_request{DB_VERSION}"
+    )
+
+  def requestEmbeddedFrontendInstance(self, state='available'):
+    self.checkSlapos(
+      'request',
+      '--state',
+      state,
+      'frontend',
+      'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg',
+    )
+
+  def test(self):
+    self.requestEmbeddedFrontendInstance()
+    # partition requested directly by user are forwarded with user_ prefix
+    self.assertEqual(self.getForwardedInstanceList(), ['user_frontend'])
+    self.assertEqual(self.getRequestedInstanceList(), [])
+    self.requestEmbeddedFrontendInstance(state='destroyed')
+
+    self.requestInstance({'forward-slapos-frontend-requests': 'disabled'})
+    self.waitForInstance()
+    self.requestEmbeddedFrontendInstance()
+    self.assertEqual(self.getForwardedInstanceList(), [])
+    self.assertEqual(self.getRequestedInstanceList(), ['frontend'])
+    self.requestEmbeddedFrontendInstance(state='destroyed')
+    self.checkSlapos('node', 'report')
+
+    self.requestInstance({'forward-slapos-frontend-requests': 'enabled'})
+    self.waitForInstance()
+    self.requestEmbeddedFrontendInstance()
+    self.assertEqual(self.getForwardedInstanceList(), ['user_frontend'])
+    self.assertEqual(self.getRequestedInstanceList(), [])
+
+
 class TestTheiaEnv(TheiaTestCase):
  dummy_software_path = os.path.abspath('dummy/software.cfg')


--- a/software/unstable/ajaxplorer/buildout.hash.cfg
+++ b/software/unstable/ajaxplorer/buildout.hash.cfg
@@ -18,7 +18,7 @@ md5sum = 1fbb72e4305ded9614ee80c0ee17b672

 [instance-apache]
 filename = instance-apachephp.cfg
-md5sum = a1ddbb63ffa0041b27eaea6df85cbd00
+md5sum = a9bc574f838985b8b8b165e2ce12fe61

 [website1-template]
 filename = templates/index.html.in

--- a/software/unstable/ajaxplorer/instance-apachephp.cfg
+++ b/software/unstable/ajaxplorer/instance-apachephp.cfg
@@ -258,7 +258,7 @@ recipe = slapos.cookbook:requestoptional
 name = Frontend-Website
 # XXX We have hardcoded SR URL here.
 software-url = $${slap-parameter:frontend-software-url}
-slave = true
+shared = true
 config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
 return = site_url
 config-custom_domain = $${slap-parameter:domain}
@@ -269,7 +269,7 @@ recipe = slapos.cookbook:requestoptional
 name = Frontend-FileManager
 # XXX We have hardcoded SR URL here.
 software-url = $${slap-parameter:frontend-software-url}
-slave = true
+shared = true
 config-url = http://[$${httpd-conf:ip}]:$${httpd-conf:port2}/
 return = site_url
 config-custom_domain = $${slap-parameter:domain2}
@@ -280,7 +280,7 @@ recipe = slapos.cookbook:requestoptional
 name = Frontend-Website2
 # XXX We have hardcoded SR URL here.
 software-url = $${slap-parameter:frontend-software-url}
-slave = true
+shared = true
 config-url = http://[$${httpd-conf:ip}]:$${httpd-conf:port3}/
 return = site_url
 config-custom_domain = $${slap-parameter:domain3}

--- a/software/unstable/cdn-me/instance-cdn-request.cfg.jinja2
+++ b/software/unstable/cdn-me/instance-cdn-request.cfg.jinja2
@@ -26,7 +26,7 @@ recipe = slapos.cookbook:requestoptional
 name = WebSite Frontend
 software-url = product.frontend
 software-type = custom-personal
-slave = true
+shared = true

 {% if slapparameter_dict.get('port', '80') != '443' %}
 config-url = http://[$${request-re6stnet-token-slave:connection-ipv6}1]:{{ slapparameter_dict.get('port', '80') }}
@@ -108,7 +108,7 @@ recipe = slapos.cookbook:requestoptional
 name = Re6st token Frontend
 # XXX We have hardcoded SR URL here.
 software-url = product.re6st
-slave = true
+shared = true
 return = token info_1 ipv6 ipv4

 [request-monitor-test-distributor-slave]
@@ -118,7 +118,7 @@ name = Monitor Test
 # XXX We have hardcoded SR URL here.
 software-url = product.monitor
 software-type = distributor
-slave = true
+shared = true
 config-ping6_ip_list = $${request-re6stnet-token-slave:connection-ipv6}
 config-ping_ip_list = $${request-re6stnet-token-slave:connection-ipv4}

@@ -131,7 +131,7 @@ name = Monitor Frontend
 # XXX We have hardcoded SR URL here.
 software-url = product.frontend
 software-type = custom-personal
-slave = true
+shared = true
 config-url = $${request-monitor-test-distributor-slave:connection-site_url}
 return = site_url domain


--- a/software/unstable/davstorage/buildout.hash.cfg
+++ b/software/unstable/davstorage/buildout.hash.cfg
@@ -4,4 +4,4 @@ md5sum = bed788dee6daf05349c4577e7a7f1299

 [instance-davstorage]
 filename = instance-davstorage.cfg
-md5sum = 081f97f9e575af7a4b7f9afc7c80dd4a
+md5sum = 5a5068ef80a830df56b88c0ec84f2202
--- a/software/unstable/davstorage/instance-davstorage.cfg
+++ b/software/unstable/davstorage/instance-davstorage.cfg
@@ -165,7 +165,7 @@ recipe = slapos.cookbook:request
 name = Frontend Ajax
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-https-only = true
 config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/
 return = domain
@@ -176,7 +176,7 @@ recipe = slapos.cookbook:request
 name = Frontend Webdav
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-https-only = true
 config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/
 return = domain

--- a/software/unstable/etherpad-lite/buildout.hash.cfg
+++ b/software/unstable/etherpad-lite/buildout.hash.cfg
@@ -4,7 +4,7 @@ md5sum = 7ab2a242df988bf5c10bf8002acac3bd

 [instance-etherpad-lite]
 _update_hash_filename_ = instance-etherpad-lite.cfg
-md5sum = 7ead62829a85f5922bb9ed0fc8dfb0df
+md5sum = 0c6ce178d13147e0df0bd2bbba0f0b0c

 [template-conf]
 _update_hash_filename_ = templates/settings.json.in

--- a/software/unstable/etherpad-lite/instance-etherpad-lite.cfg
+++ b/software/unstable/etherpad-lite/instance-etherpad-lite.cfg
@@ -66,7 +66,7 @@ recipe = slapos.cookbook:request
 name = Frontend
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = http://$${etherpad-conf-generation:ip}:$${etherpad-conf-generation:port}
 return = site_url


--- a/software/unstable/hexaglobe-watermarking/instance-watermarking.cfg.in
+++ b/software/unstable/hexaglobe-watermarking/instance-watermarking.cfg.in
@@ -164,7 +164,7 @@ recipe = slapos.cookbook:requestoptional
 name = Frontend for $${slap-connection:computer-id} $${slap-connection:partition-id}
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = http://[$${instance-parameter:ipv6-random}]:5000
 return = site_url


--- a/software/unstable/lamp-generic/instance-apache-php.cfg.in
+++ b/software/unstable/lamp-generic/instance-apache-php.cfg.in
@@ -150,7 +150,7 @@ recipe = slapos.cookbook:requestoptional
 name = Frontend
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
 return = site_url
 config-custom_domain = $${slap-parameter:domain}

--- a/software/unstable/trac-svn/instance-trac.cfg
+++ b/software/unstable/trac-svn/instance-trac.cfg
@@ -435,7 +435,7 @@ recipe = slapos.cookbook:requestoptional
 name = Frontend
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = http://[$${slap-network-information:global-ipv6}]:8080
 return = site_url
 config-custom_domain = $${slap-parameter:domain}

--- a/stack/erp5/buildout.hash.cfg
+++ b/stack/erp5/buildout.hash.cfg
@@ -74,7 +74,7 @@ md5sum = a75e8cf8fd664de164a88a680ddd2c9e

 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 3d8f3a440b7423c3b947c6ea4d775c6e
+md5sum = 52dfc0c9a4547b1e928707ef5caeecdb

 [template-zeo]
 filename = instance-zeo.cfg.in

--- a/stack/erp5/instance-erp5.cfg.in
+++ b/stack/erp5/instance-erp5.cfg.in
@@ -434,7 +434,7 @@ recipe = slapos.cookbook:request
 software-url = {{ dumps(frontend_dict['software-url']) }}
 software-type = {{ dumps(frontend_dict.get('software-type', 'RootSoftwareInstance')) }}
 {{ root_common.sla('frontend', True) }}
-slave = true
+shared = true
 {% set config_dict = {
  'type': 'zope',
 } -%}

--- a/stack/lamp/buildout.hash.cfg
+++ b/stack/lamp/buildout.hash.cfg
@@ -22,7 +22,7 @@ md5sum = 8506f245087dfdc02561e8739a567bd6

 [instance-lamp]
 filename = instance-lamp.cfg.jinja2.in
-md5sum = 79343539dff96f2d4592a4358d469201
+md5sum = 3ff36cb2d10f53f932ba9ee99b5fe9e1

 [template-apache.conf]
 filename = apache.conf.in

--- a/stack/lamp/instance-lamp.cfg.jinja2.in
+++ b/stack/lamp/instance-lamp.cfg.jinja2.in
@@ -69,7 +69,7 @@ recipe = slapos.cookbook:requestoptional
 name = Instance Frontend
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = ${request-apache:connection-backend-url}
 config-https-only = true
 return = domain secure_access

--- a/stack/monitor/buildout.hash.cfg
+++ b/stack/monitor/buildout.hash.cfg
@@ -14,7 +14,7 @@
 # not need these here).
 [monitor2-template]
 filename = instance-monitor.cfg.jinja2.in
-md5sum = 7e7b964f324d803d40112e88cc8d75d8
+md5sum = 255b4f5f2d960ec958899114cef4cfd9

 [monitor-httpd-conf]
 _update_hash_filename_ = templates/monitor-httpd.conf.in

--- a/stack/monitor/instance-monitor.cfg.jinja2.in
+++ b/stack/monitor/instance-monitor.cfg.jinja2.in
@@ -344,7 +344,7 @@ recipe = slapos.cookbook:requestoptional
 name = Monitor Frontend ${monitor-instance-parameter:monitor-title}
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = ${monitor-httpd-conf-parameter:url}
 config-https-only = true
 #software-type = custom-personal

--- a/stack/resilient/buildout.hash.cfg
+++ b/stack/resilient/buildout.hash.cfg
@@ -30,7 +30,7 @@ md5sum = 1b8645835f04081861266436505fd28f

 [template-replicated]
 filename = template-replicated.cfg.in
-md5sum = ba90373d7ba062a6b8117b821a2d7765
+md5sum = 52762882e0d631f51d2c9e5f8b31c0b6

 [template-parts]
 filename = template-parts.cfg.in

--- a/stack/resilient/template-replicated.cfg.in
+++ b/stack/resilient/template-replicated.cfg.in
@@ -178,7 +178,7 @@ config-command = ${resilient-request-{{namebase}}-pseudo-replicating-{{id}}-publ



-## The PBS and their push / pull slaves
+## The PBS and their push / pull shared instances
 ## Adding a PBS provides resiliency
 ## Adding a backup server provides availability

@@ -201,7 +201,7 @@ config-monitor-title = PBS ${slap-connection:computer-id}-{{namebase}}-{{id}}
 config-{{ key }} = {{ value }}
 {% endfor -%}
 return = ssh-key notification-url feeds-url  {{ monitor_return }}
-slave = false
+shared = false
 {% if sla_parameter_dict == {} -%}
 sla-mode = unique_by_network
 {% else %}
@@ -253,7 +253,7 @@ config-notification-id = ${slap-connection:computer-id}-${slap-connection:partit
 config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}}
 config-title = Pulling from {{namebase}}
 config-remove-backup-older-than = {{ slapparameter_dict.get('remove-backup-older-than', '2W') }}
-slave = true
+shared = true
 sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}

 [publish-connection-information]
@@ -282,7 +282,7 @@ config-notify = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-noti
 config-notification-id = ${request-{{namebase}}-pseudo-replicating-{{id}}:pbs-notification-id}
 config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}}
 config-title = Pushing to {{namebase}} backup {{id}}
-slave = true
+shared = true
 sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
 {% endfor %}


--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -194,12 +194,12 @@ setproctitle = 1.1.10
 setuptools-dso = 1.7
 rubygemsrecipe  = 0.4.3
 six = 1.16.0
-slapos.cookbook = 1.0.272
-slapos.core = 1.8.3
+slapos.cookbook = 1.0.291
+slapos.core = 1.8.4
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.25
 slapos.rebootstrap = 4.5
-slapos.recipe.build = 0.55
+slapos.recipe.build = 0.56
 slapos.recipe.cmmi = 0.19
 slapos.recipe.template = 5.0
 slapos.toolbox = 0.128

--- a/stack/unstable/boinc/instance-boinc.cfg
+++ b/stack/unstable/boinc/instance-boinc.cfg
@@ -300,7 +300,7 @@ recipe = slapos.cookbook:requestoptional
 name = Frontend
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
 return = site_url
 config-custom_domain = $${slap-parameter:domain}

--- a/stack/unstable/lapp/apache/instance-apache-php.cfg.in
+++ b/stack/unstable/lapp/apache/instance-apache-php.cfg.in
@@ -231,7 +231,7 @@ recipe = slapos.cookbook:requestoptional
 name = Frontend
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
+shared = true
 config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
 return = site_url
 config-custom_domain = $${slap-parameter:domain}