Merge remote-tracking branch 'upstream/master' into zope4py2

component/ca-certificates/buildout.cfg

@@ -16,7 +16,7 @@ url = http://deb.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_2
 md5sum = c02582bf9ae338e558617291897615eb
 patch-binary = ${patch:location}/bin/patch
 patches =
-  ${:_profile_base_location_}/ca-certificates-any-python.patch#47c2509f1346bd5af8123fb1a2751c2c
+  ${:_profile_base_location_}/ca-certificates-any-python.patch#c13b44dfc3157dda13a9a2ff97a9d501
   ${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b
 patch-options = -p0
 configure-command = true

component/ca-certificates/ca-certificates-any-python.patch

@@ -16,7 +16,7 @@
  
  all:
 -	python3 certdata2pem.py
-+	for x in '' 2 3; do type python$$x && break; done >/dev/null \
++	for x in 3 '' 2; do type python$$x && break; done >/dev/null \
 +	&& python$$x certdata2pem.py
  
  clean:

component/fluentbit-plugin-wendelin/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 [fluentbit-plugin-wendelin]
 recipe = slapos.recipe.cmmi
 share = true
-url = https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin/-/archive/v0.1i-dev_buildout/fluentbit-plugin-wendelin-v0.1i-dev_buildout.tar.gz
-md5sum = 9ed2ef46b0edfca072255b849ee65249
+url = https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin/-/archive/v0.1j-dev_buildout/fluentbit-plugin-wendelin-v0.1j-dev_buildout.tar.gz
+md5sum = 98cd6c892ff92cdeaffa0310840a476a
 configure-command = echo "No configure command."
 environment =
   PATH=${golang1.17:location}/bin:%(PATH)s

component/glib/buildout.cfg

@@ -7,6 +7,7 @@ extends =
   ../perl/buildout.cfg
   ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
+  ../defaults.cfg
 parts =
   glib
 
@@ -25,7 +26,7 @@ configure-options =
   --disable-fam
   --disable-xattr
   --disable-man
-  --with-python=$PYTHON
+  --with-python=python${python:version}
 environment =
   PATH=${gettext:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include

component/proxysql/buildout.cfg

@@ -36,7 +36,7 @@ post-install =
   install -Dt %(location)s/bin %(make-targets)s
 environment =
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${gnutls:location}/lib/pkgconfig:${libgcrypt:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
-  PATH=${m4:location}/bin:${libtool:location}/bin:${libgcrypt:location}/bin:${curl:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${bzip2:location}/bin:${autoconf:location}/bin:${git:location}/bin:${automake:location}/bin:${patch:location}/bin:${cmake:location}/bin:%(PATH)s:${python2.7:location}/bin
+  PATH=${m4:location}/bin:${libtool:location}/bin:${libgcrypt:location}/bin:${curl:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${bzip2:location}/bin:${autoconf:location}/bin:${git:location}/bin:${automake:location}/bin:${patch:location}/bin:${cmake:location}/bin:${python2.7:location}/bin:%(PATH)s
   CXXFLAGS=-I${openssl:location}/include -I${gnutls:location}/include -I${zlib:location}/include
   CFLAGS=-I${gnutls:location}/include
   LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath=${curl:location}/lib -L${libtool:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${curl:location}/lib -L${pcre:location}/lib -L${jemalloc:location}/lib -L${libmicrohttpd:location}/lib
@@ -47,4 +47,4 @@ environment =
 patch-options = -p1
 patches =
 # PR #3402 (mariadb_client: backport patch to fix syntax error in cmake 3.20)
-  https://github.com/sysown/proxysql/commit/a3cfa56d257219f7610cd5711045bb5d84485a91.patch
+  https://github.com/sysown/proxysql/commit/a3cfa56d257219f7610cd5711045bb5d84485a91.patch#bb034744fd9b676484d34a269ab2ed07

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.272'
+version = '1.0.291'
 name = 'slapos.cookbook'
 long_description = open("README.rst").read()
 

slapos/recipe/request.py

@@ -65,8 +65,8 @@ class Recipe(object):
       Software type of requested instance, among those provided by the
       definition from software-url.
 
-    slave (optional, defaults to false)
-      Set to "true" when requesting a slave instance, ie just setting a set of
+    shared (optional, defaults to false)
+      Set to "true" when requesting a shared instance, ie just setting a set of
       parameters in an existing instance.
 
     sla (optional)
@@ -119,7 +119,7 @@ class Recipe(object):
     partition_parameter_kw = self._filterForStorage({k[7:]: v
       for k, v in six.iteritems(options)
       if k.startswith('config-')})
-    slave = options.get('slave', 'false').lower() in \
+    shared = options.get('shared', 'false').lower() in \
       librecipe.GenericBaseRecipe.TRUE_VALUES
 
     # By default, propagate the state of the parent instance
@@ -162,12 +162,12 @@ class Recipe(object):
     try:
       self.instance = request(software_url, software_type,
           name, partition_parameter_kw=partition_parameter_kw,
-          filter_kw=filter_kw, shared=slave, state=requested_state)
+          filter_kw=filter_kw, shared=shared, state=requested_state)
       return_parameter_dict = self._getReturnParameterDict(self.instance,
           return_parameters)
       # Fetch the instance-guid and the instance-state
-      # Note: SlapOS Master does not support it for slave instances
-      if not slave:
+      # Note: SlapOS Master does not support it for shared instances
+      if not shared:
         try:
           options['instance-guid'] = self.instance.getInstanceGuid() \
               .encode('UTF-8')
@@ -189,7 +189,7 @@ class Recipe(object):
           request_name=name,
           partition_parameter_kw=partition_parameter_kw,
           filter_kw=filter_kw,
-          shared=slave,
+          shared=shared,
           state=requested_state
         )
       )

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

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}

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

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

software/cloudooo/buildout.hash.cfg

@@ -18,4 +18,8 @@ md5sum = d1e4d7306c39f2ebc64d0407860d4301
 
 [template-cloudooo-instance]
 filename = instance-cloudooo.cfg.in
-md5sum = 90299c1dbdc5f983613794a8e9a7bc9d
+md5sum = 3c499fd3cdfc7915d6eaf1cf4130b56d
+
+[template-haproxy-cfg]
+filename = haproxy.cfg.in
+md5sum = 3d989eeb2e326bb0daf9351850f7fc39

software/cloudooo/haproxy.cfg.in

+global
+  maxconn 4096
+  stats socket {{ parameter_dict['socket-path'] }} level admin
+  master-worker
+  pidfile {{ parameter_dict['pidfile'] }}
+
+defaults
+  mode http
+  retries 1
+  option redispatch
+  maxconn 2000
+  timeout server 305s
+  timeout queue 60s
+  timeout connect 5s
+  timeout client 305s
+  option httpclose
+
+listen cloudooo
+  bind {{ parameter_dict['ip'] }}:{{ parameter_dict['port'] }}
+  balance roundrobin
+  stats uri /haproxy
+
+{% for i, backend_netloc in enumerate(parameter_dict['backend-list'].splitlines()) -%}
+  server cloudooo_{{ i + 1 }} {{ backend_netloc }} rise 1 fall 2 maxqueue 5 maxconn 1
+{% endfor %}

software/cloudooo/instance-cloudooo.cfg.in

@@ -68,7 +68,7 @@ parts =
   apache-promise
   apache-logrotate
   cloudooo-test-runner
-  haproxy
+  haproxy-service
   xvfb-instance
   wkhtmltopdf-on-xvfb
 
@@ -181,17 +181,25 @@ wrapper = ${directory:services}/{{ name }}
 
 {% endfor -%}
 
+[haproxy-cfg]
+recipe = slapos.recipe.template:jinja2
+url = {{ parameter_dict['template-haproxy-cfg'] }}
+output = ${directory:etc}/haproxy.cfg
+context =
+  section parameter_dict haproxy
+
+[haproxy-service]
+recipe = slapos.cookbook:wrapper
+wrapper-path = ${directory:services}/${:_buildout_section_name_}
+command-line =
+  "{{ parameter_dict['haproxy'] }}/sbin/haproxy" -f "${haproxy-cfg:output}"
+hash-files = ${haproxy-cfg:output}
+
 [haproxy]
-recipe = slapos.cookbook:haproxy
-name = cloudooo
-conf-path = ${directory:etc}/haproxy.cfg
 socket-path = ${directory:run}/haproxy.sock
+pidfile =  ${directory:run}/haproxy.pid
 ip = {{ ipv4 }}
 port = {{ haproxy_port }}
-maxconn = 1
-wrapper-path = ${directory:services}/haproxy
-binary-path = {{ parameter_dict['haproxy'] }}/sbin/haproxy
-ctl-path = ${directory:bin}/haproxy-ctl
 backend-list =
 {%- for section_name in cloudooo_section_list %}
   {{ "${" ~ section_name ~ ":ip}:${" ~ section_name ~ ":port}" }}
@@ -230,7 +238,6 @@ link-binary =
   {{ parameter_dict['poppler'] }}/bin/pdftohtml
   {{ parameter_dict['onlyoffice-core'] }}/bin/x2t
 
-# rest of parts are candidates for some generic stuff
 [directory]
 recipe = slapos.cookbook:mkdirectory
 apache-conf = ${:etc}/apache

software/cloudooo/software-common.cfg

@@ -92,11 +92,16 @@ zlib = ${zlib:location}
 template-apache-conf = ${template-apache-backend-conf:target}
 template-logrotate-base = ${template-logrotate-base:output}
 template-monitor = ${monitor2-template:output}
+template-haproxy-cfg = ${template-haproxy-cfg:target}
 
 [template-cloudooo-instance]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
 
+[template-haproxy-cfg]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/${:filename}
+
 [versions]
 argparse = 1.4.0
 pyPdf = 1.13

software/dufs/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [instance.cfg.in]
 filename = instance.cfg.in
-md5sum = 9553d3f24d4201d3320408d8a3154049
+md5sum = 0cb3cbac5479581985e5446078217686

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
 

software/erp5/upgrade_test/test.py

@@ -46,7 +46,7 @@ from slapos.testing.testcase import (
   makeModuleSetUpAndTestCaseClass,
 )
 
-old_software_release_url = 'https://lab.nexedi.com/nexedi/slapos/raw/1.0.167.5/software/erp5/software.cfg'
+old_software_release_url = 'https://lab.nexedi.com/nexedi/slapos/raw/1.0.167.6/software/erp5/software.cfg'
 new_software_release_url = os.path.abspath(
   os.path.join(os.path.dirname(__file__), '..', 'software.cfg'))
 

software/erp5testnode/buildout.hash.cfg

@@ -18,4 +18,4 @@ md5sum = 5bd72da73a8b84f70f568686924d7d6c
 
 [template-default]
 filename = instance-default.cfg.jinja.in
-md5sum = 0c9ea9fa7417885889a536ec2cf2093f
+md5sum = 2aafd7708aac85847da3a8679b84fe34

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
 

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

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

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

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

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

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.

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

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

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

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
 

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

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

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

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)) }}

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}

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

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

software/restic-rest-server/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [instance.cfg.in]
 filename = instance.cfg.in
-md5sum = a5a05e6949d78882bde4d53fb21cdd00
+md5sum = 573e23c88fea6a11ab5c79b1eb106601

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
 

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

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',
 } -%}

software/slapos-sr-testing/software.cfg

@@ -22,6 +22,7 @@ extends =
 
 parts =
   eggs/scripts
+  python2.7-disabled
   slapos-cookbook
   template
 
@@ -251,6 +252,26 @@ branch = master
 egg = slapos.core
 setup = ${slapos.core-repository:location}
 
+[python2.7-disabled]
+# An "intentionally broken" python2 command that should catch
+# accidental usage of things like #!/usr/bin/env python2
+recipe = zc.recipe.egg
+# we need an egg to generate a script, use the one from this part's recipe
+eggs = ${:recipe}
+interpreter = python2.7
+entry-points =
+  python=${:eggs}:ignored
+  python2=${:eggs}:ignored
+  python2.7=${:eggs}:ignored
+scripts =
+  python
+  python2
+  python2.7
+initialization =
+  import sys
+  print("Error: attempt to use system python2", file=sys.stderr)
+  sys.exit(2)
+
 [python-interpreter]
 eggs +=
   ${lxml-python:egg}

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

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

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance-theia]
 _update_hash_filename_ = instance-theia.cfg.jinja.in
-md5sum = 56ad229756d2d57971c583104370dcc7
+md5sum = 153be75bad8e1f38fbf05fedbf99650d
 
 [instance]
 _update_hash_filename_ = instance.cfg.in

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

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

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}

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
 

software/unstable/davstorage/buildout.hash.cfg

@@ -4,4 +4,4 @@ md5sum = bed788dee6daf05349c4577e7a7f1299
 
 [instance-davstorage]
 filename = instance-davstorage.cfg
-md5sum = 081f97f9e575af7a4b7f9afc7c80dd4a
+md5sum = 5a5068ef80a830df56b88c0ec84f2202

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

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

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
 

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
 

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}

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}

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

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',
 } -%}

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

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

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

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

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

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 %}
 

stack/slapos.cfg

@@ -195,7 +195,7 @@ setproctitle = 1.1.10
 setuptools-dso = 1.7
 rubygemsrecipe  = 0.4.3
 six = 1.16.0
-slapos.cookbook = 1.0.272
+slapos.cookbook = 1.0.291
 slapos.core = 1.8.3
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.25

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}

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}