Update Release Candidate

component/ffmpeg/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../bzip2/buildout.cfg
   ../libpng/buildout.cfg
   ../patch/buildout.cfg
+  ../ncurses/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
   ../xorg/buildout.cfg
@@ -86,6 +87,10 @@ md5sum = 8e9866ad6b570c6c95c8cba48060473f
 configure-options =
   --disable-static
   --disable-gtktest
+environment =
+  PKG_CONFIG=${pkgconfig:location}/bin/pkgconfig
+  PKG_CONFIG_PATH=${ncurses:location}/lib/pkgconfig
+  LDFLAGS=-Wl,-rpath=${ncurses:location}/lib
 
 [opencore-amr]
 recipe = slapos.recipe.cmmi

component/gettext/buildout.cfg

@@ -19,6 +19,7 @@ configure-options =
   --disable-java
   --disable-native-java
   --disable-csharp
+  --disable-more-warnings
   --with-libncurses-prefix=${ncurses:location}
   --with-libxml2-prefix=${libxml2:location}
   --with-included-gettext

component/mariadb/buildout.cfg

@@ -4,6 +4,7 @@
 [buildout]
 extends =
   ../binutils/buildout.cfg
+  ../bison/buildout.cfg
   ../bzip2/buildout.cfg
   ../cmake/buildout.cfg
   ../groonga/buildout.cfg
@@ -12,10 +13,12 @@ extends =
   ../libedit/buildout.cfg
   ../libxml2/buildout.cfg
   ../lz4/buildout.cfg
+  ../m4/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
   ../patch/buildout.cfg
   ../pcre/buildout.cfg
+  ../pcre2/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../snappy/buildout.cfg
   ../xz-utils/buildout.cfg
@@ -26,12 +29,11 @@ extends =
 parts =
   mariadb
 
-[mariadb]
+[mariadb-common]
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://archive.mariadb.org//mariadb-${:version}/source/mariadb-${:version}.tar.gz
-version = 10.4.28
-md5sum = d098e9af77a26260a6a6c21a7ed0daf6
+pcre-location = ${pcre2:location}
 pre-configure =
   set '\bSET(PLUGIN_AUTH_PAM YES CACHE BOOL "")' cmake/build_configurations/mysql_release.cmake
   grep -q "$@"
@@ -73,17 +75,14 @@ configure-options =
 #  https://lore.kernel.org/linux-btrfs/ed3642c2-682e-08a1-f18d-2d63409b7631@nexedi.com/T/
   -DWITH_FALLOCATE=NO
 ##
-CMAKE_CFLAGS = -I${bzip2:location}/include -I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${libedit:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${unixodbc:location}/include -I${lz4:location}/include -I${snappy:location}/include -I${zstd:location}/include
-CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${libedit:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib:${unixodbc:location}/lib:${lz4:location}/lib:${snappy:location}/lib:${zstd:location}/lib
+CMAKE_CFLAGS = -I${bzip2:location}/include -I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${:pcre-location}/include -I${libedit:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${unixodbc:location}/include -I${lz4:location}/include -I${snappy:location}/include -I${zstd:location}/include
+CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${:pcre-location}/lib:${libedit:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib:${unixodbc:location}/lib:${lz4:location}/lib:${snappy:location}/lib:${zstd:location}/lib
 environment =
   CMAKE_PROGRAM_PATH=${cmake:location}/bin
-  CMAKE_INCLUDE_PATH=${bzip2:location}/include:${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${pcre:location}/include:${libedit:location}/include:${xz-utils:location}/include:${zlib:location}/include:${unixodbc:location}/include:${lz4:location}/include:${snappy:location}/include:${zstd:location}/include
+  CMAKE_INCLUDE_PATH=${bzip2:location}/include:${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${:pcre-location}/include:${libedit:location}/include:${xz-utils:location}/include:${zlib:location}/include:${unixodbc:location}/include:${lz4:location}/include:${snappy:location}/include:${zstd:location}/include
   CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
-  LDFLAGS=-L${bzip2:location}/lib -L${jemalloc:location}/lib -L${libaio:location}/lib -L${pcre:location}/lib -L${xz-utils:location}/lib -L${zlib:location}/lib -L${unixodbc:location}/lib -L${lz4:location}/lib -L${snappy:location}/lib -L${zstd:location}/lib
-  PATH=${patch:location}/bin:%(PATH)s
-patch-options = -p1
-patches =
-  https://sources.debian.org/data/main/m/mariadb-10.3/1:10.3.34-0+deb10u1/debian/patches/0024-Revert-to-using-system-pcre-library.patch#1c6a0f2634f5a56122299674b77b1131
+  LDFLAGS=-L${bzip2:location}/lib -L${jemalloc:location}/lib -L${libaio:location}/lib -L${:pcre-location}/lib -L${xz-utils:location}/lib -L${zlib:location}/lib -L${unixodbc:location}/lib -L${lz4:location}/lib -L${snappy:location}/lib -L${zstd:location}/lib
+  PATH=${bison:location}/bin:${m4:location}/bin:${patch:location}/bin:%(PATH)s
 post-install =
   ldd=`ldd %(location)s/lib/plugin/ha_rocksdb.so`
   for x in ${lz4:location} ${snappy:location} ${zstd:location}
@@ -92,6 +91,34 @@ post-install =
   set -- wsrep-lib/wsrep-API/*/wsrep_api.h
   install -DpT $1 %(location)s/$1
   cp -a wsrep-lib/include %(location)s/wsrep-lib
+  cp -a storage/perfschema/libperfschema.a %(location)s/lib
+
+[mariadb-10.4]
+<= mariadb-common
+version = 10.4.32
+md5sum = f5ce8167e5ede5aaeec8f7475f120c19
+pcre-location = ${pcre:location}
+patch-options = -p1
+patches =
+  https://sources.debian.org/data/main/m/mariadb-10.3/1:10.3.34-0+deb10u1/debian/patches/0024-Revert-to-using-system-pcre-library.patch#1c6a0f2634f5a56122299674b77b1131
+
+[mariadb-10.5]
+<= mariadb-common
+version = 10.5.23
+md5sum = cc89da1cb931bc920f3b0492cb7f1657
+
+[mariadb-10.6]
+<= mariadb-common
+version = 10.6.16
+md5sum = 3eb1e80e0e2c055686aeb5e900cfe94e
+
+[mariadb-10.11]
+<= mariadb-common
+version = 10.11.6
+md5sum = 71c8ef8b36221e348cecb9d13e6718e5
+
+[mariadb]
+<= mariadb-10.4
 
 [mroonga-mariadb]
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.

component/proftpd/buildout.cfg

@@ -7,6 +7,7 @@ extends =
   ../zlib/buildout.cfg
   ../curl/buildout.cfg
   ../libtool/buildout.cfg
+  ../ncurses/buildout.cfg
   ../git/buildout.cfg
   ../patch/buildout.cfg
   ../zstd/buildout.cfg
@@ -32,8 +33,8 @@ configure-options =
   --with-modules=mod_sftp:mod_ban:mod_rewrite
 environment =
   CFLAGS=-DPR_RUN_DIR=\"/proc/self/cwd/var\"
-  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${ncurses:location}/include -I${openssl:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
   install_user=${proftpd-info:USER}
   install_group=${proftpd-info:GROUP}
 patch-binary = ${patch:location}/bin/patch

component/r-language/buildout.cfg

@@ -10,6 +10,14 @@ extends =
 parts =
   r-language
 
+[libtirpc]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://downloads.sourceforge.net/libtirpc/libtirpc-1.3.4.tar.bz2
+md5sum = 375dbe7ceb2d0300d173fb40321b49b6
+configure-options =
+  --disable-gssapi
+
 [r-language]
 recipe = slapos.recipe.cmmi
 url = https://cran.r-project.org/src/base/R-3/R-3.2.1.tar.gz
@@ -31,5 +39,5 @@ configure-options =
   --without-ICU
   --without-x
 environment =
-  CPPFLAGS=-I${bzip2:location}/include -I${openblas:location}/include -I${pcre:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${xz-utils:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openblas:location}/lib -Wl,-rpath=${openblas:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CPPFLAGS=-I${bzip2:location}/include -I${openblas:location}/include -I${pcre:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${libtirpc:location}/include
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openblas:location}/lib -Wl,-rpath=${openblas:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libtirpc:location}/lib  -Wl,-rpath=${libtirpc:location}/lib

component/tcl/buildout.cfg

@@ -10,7 +10,7 @@ md5sum = 0e4358aade2f5db8a8b6f2f6d9481ec2
 shared = true
 environment =
   CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -lm
 pre-configure = rm -r pkgs/*/
 configure-command = unix/configure
 configure-options =

component/trafficserver/buildout.cfg

@@ -48,7 +48,8 @@ patches =
   ${:_profile_base_location_}/trafficserver-9.1.1-via-string-rapid-cdn.patch#8c39243d7525222385d5964485734f99
 environment =
   PATH=${libtool:location}/bin:${make:location}/bin:${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  LDFLAGS =-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${luajit:location}/lib  -lm
+  LDFLAGS =-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${luajit:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -lm
+  CURSES_CFLAGS=-I${ncurses:location}/include
 
 make-target =
   check

component/util-linux/buildout.cfg

 [buildout]
 extends =
   ../perl/buildout.cfg
+  ../ncurses/buildout.cfg
   ../libcap-ng/buildout.cfg
+  ../pkgconfig/buildout.cfg
   ../xz-utils/buildout.cfg
 
 [util-linux]
@@ -41,15 +43,15 @@ configure-options =
   --disable-wall
   --without-libiconv-prefix
   --without-libintl-prefix
-  --without-ncurses
   --without-slang
   --without-selinux
   --without-audit
   --with-cap-ng=${libcap-ng:location}
 environment =
-  PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  LDFLAGS=-L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib
-  CFLAGS=-I${libcap-ng:location}/include
+  PATH=${perl:location}/bin:${xz-utils:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  LDFLAGS=-L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+  CFLAGS=-I${libcap-ng:location}/include -I${ncurses:location}/include
+  PKG_CONFIG_PATH=${ncurses:location}/lib/pkgconfig
 
 [libuuid]
 # libuuid is inside util-linux source code with only libuuid feature enabled.
@@ -60,7 +62,6 @@ configure-options =
   --enable-libuuid
   --without-libiconv-prefix
   --without-libintl-prefix
-  --without-ncurses
   --without-slang
   --without-pam
   --without-selinux
@@ -68,3 +69,5 @@ configure-options =
 
 environment =
   PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+  CFLAGS=-I${ncurses:location}/include

software/dream/software.cfg

@@ -42,7 +42,6 @@ command =
   cd ${dream-repository.git:location}
   PATH=${git:location}/bin:${nodejs:location}/bin:$PATH
   npm install .
-update_command = ${:command}
 
 [versions]
 rpy2 = 2.4.0

software/galene/instance-default-input-schema.json

@@ -14,6 +14,13 @@
       "description": "Use a password for presenter",
       "type": "boolean",
       "default": true
+    },
+    "ice-servers.json": {
+      "title": "Content of ice-servers.json",
+      "description": "Raw content of ice-servers.json (see at the end of https://galene.org/INSTALL.html)",
+      "type": "string",
+      "textarea": true,
+      "default": "[{\"urls\":[\"stun:turn-paris-rapidspace.api.nexedi.net:443\"]}]"
     }
   }
 }

software/galene/software-base.cfg

-[buildout]
-extends =
-  ../../component/golang/buildout.cfg
-  ../../component/openssl/buildout.cfg
-  ../../stack/slapos.cfg
-  ../../stack/monitor/buildout.cfg
-  buildout.hash.cfg
-
-parts =
-  slapos-cookbook
-  eggs
-  template
-  template-default
-
-# eggs for instance.cfg
-[eggs]
-recipe  = zc.recipe.egg
-eggs    =
-    plone.recipe.command
-    collective.recipe.template
-
-
-[galene]
-<= go-git-package
-go.importpath = lab.nexedi.com/nexedi/galene
-repository = https://lab.nexedi.com/nexedi/galene.git
-revision = galene-ptt-0.6.4
-
-[gowork]
-install =
-    ${galene:location}:./...
-environment =
-   CGO_ENABLED = 0
-buildflags = -ldflags='-s -w'
-
-[template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/${:filename}
-output = ${buildout:directory}/template.cfg
-
-[template-default]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/${:filename}
-output = ${buildout:directory}/template-default.cfg

software/galene/software-ptt.cfg

 [buildout]
 extends =
-  software-base.cfg
+  software.cfg
 
 [galene]
-<= go-git-package
-go.importpath = lab.nexedi.com/nexedi/galene
-repository = https://lab.nexedi.com/nexedi/galene.git
 revision = galene-ptt-0.6.4

software/galene/software.cfg

 [buildout]
 extends =
-  software-base.cfg
+  ../../component/golang/buildout.cfg
+  ../../component/openssl/buildout.cfg
+  ../../stack/slapos.cfg
+  ../../stack/monitor/buildout.cfg
+  buildout.hash.cfg
+
+parts =
+  slapos-cookbook
+  eggs
+  template
+  template-default
+
+# eggs for instance.cfg
+[eggs]
+recipe  = zc.recipe.egg
+eggs    =
+    plone.recipe.command
+    collective.recipe.template
+
+[gowork]
+install =
+    ${galene:location}:./...
+environment =
+   CGO_ENABLED = 0
+buildflags = -ldflags='-s -w'
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/template.cfg
+
+[template-default]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/template-default.cfg
 
 [galene]
 <= go-git-package
 go.importpath = lab.nexedi.com/nexedi/galene
 repository = https://lab.nexedi.com/nexedi/galene.git
-revision = galene-0.7.1
+revision = galene-0.8

software/galene/test/testPTT.py

+##############################################################################
+#
+# Copyright (c) 2019 Nexedi SA 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 __future__ import unicode_literals
+
+import os
+import requests
+
+from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
+
+
+setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
+    os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '../software-ptt.cfg')))
+
+
+class TestGalene(SlapOSInstanceTestCase):
+  __partition_reference__ = 'G'
+
+  def setUp(self):
+    self.connection_parameters = self.computer_partition.getConnectionParameterDict()
+
+  def test_url_get(self):
+    resp = requests.get(self.connection_parameters['url'], verify=False)
+    self.assertEqual(requests.codes.ok, resp.status_code)
+

software/gitlab/software.cfg

@@ -135,7 +135,7 @@ git-executable = ${git:location}/bin/git
 <= git-repository
 repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
 # 9.5.10 + NXD patches:
-revision = v9.5.10-12-g74c9f9fe7f9
+revision = v9.5.10-13-g2b98fc27fd2
 location = ${buildout:parts-directory}/gitlab
 
 [gitlab-shell-repository]
@@ -187,7 +187,7 @@ configure-command = cd ${:path} &&
 
 make-binary =
 make-targets= cd ${:path} &&
-    ${:bundle} install --deployment  --without development test mysql aws kerberos
+    ${:bundle} install --deployment  --without development test mysql aws kerberos ed25519
 environment =
   PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${re2:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = df4d6e24453b649cc20564d7fcc38e4b
+md5sum = a9e416eaa3ad7d2ea29cb90ce2c41a60
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
@@ -32,7 +32,7 @@ md5sum = ab666fdfadbfc7d8a16ace38d295c883
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = a6b710ca5132276d72f90b76b873fe98
+md5sum = 6febf4dc601ba5feb30aa402f37265cf
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -40,7 +40,7 @@ md5sum = c20b620111a4dc4bc2bcae57c2007cbe
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = a150743e78f9ecafc40b715f2aa80295
+md5sum = abce2deca15b8d7a8c5378e0789f8ce7
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
@@ -80,7 +80,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = b52a8584712f9cee338c71a6dedc7dad
+md5sum = 3b380ac8a44aafc30cc6d87b35860fd6
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
@@ -134,9 +134,9 @@ md5sum = 3d7833ddba3242cedcd74c7db52390c6
 filename = config/dnsmasq-core-network.jinja2.cfg
 md5sum = f167b4be5e327b276b42267e0678f577
 
-[dnsmasq-enb.jinja2.cfg]
-filename = config/dnsmasq-enb.jinja2.cfg
-md5sum = 03e2e642d86b5c21181c7dba874cc08c
+[ru_dnsmasq.jinja2.cfg]
+_update_hash_filename_ = ru/dnsmasq.jinja2.cfg
+md5sum = 345e4967d468b00c13d77821bce8a248
 
 [ims.jinja2.cfg]
 filename = config/ims.jinja2.cfg

software/ors-amarisoft/instance-enb-input-schema.json.jinja2

@@ -180,14 +180,6 @@
       "type": "number"
     },
 {%- endif %}
-{%- if trx == 'cpri' %}
-    "dnsmasq": {
-      "default": false,
-      "title": "dnsmasq",
-      "description": "dnsmasq",
-      "type": "boolean"
-    },
-{%- endif %}
 {%- if ru == 'lopcomm' %}
     "txa0cc00_active": {
       "title": "Lopcomm ORAN TX array carriers (TXA0CC00)",

software/ors-amarisoft/instance-enb.jinja2.cfg

@@ -14,15 +14,8 @@ parts =
   sshd-add-authorized-key
   sshd-promise
 {% endif %}
-{% if slapparameter_dict.get("dnsmasq", None) %}
-  dnsmasq-service
-{% endif %}
-  check-sdr-busy.py
   check-baseband-latency.py
   check-amarisoft-stats-log.py
-{% if not ru == "lopcomm"  %}
-  check-rx-saturated.py
-{% endif %}
   monitor-base
   publish-connection-information
 
@@ -120,39 +113,6 @@ environment =
   LD_LIBRARY_PATH={{ openssl_location }}/lib
   AMARISOFT_PATH=/opt/amarisoft/.amarisoft
 
-{% if slapparameter_dict.get("dnsmasq", None) %}
-[dnsmasq-config]
-recipe = slapos.recipe.template:jinja2
-url = {{dnsmasq_template}}
-filename = dnsmasq.cfg
-extensions = jinja2.ext.do
-output = ${directory:etc}/${:filename}
-context =
-  import json_module json
-  import netaddr netaddr
-  section directory directory
-  section vtap_jdict vtap_jdict
-  json cell_list {{ rulib.cell_list | tojson }}
-  raw ru {{ ru }}
-
-[dnsmasq-service]
-recipe = slapos.cookbook:wrapper
-port = 5353
-ip = ${slap-configuration:tun-ipv4-addr}
-command-line = {{ dnsmasq_location }}/sbin/dnsmasq --conf-file=${dnsmasq-config:output} -x ${directory:run}/dnsmasq.pid --local-service --keep-in-foreground
-wrapper-path = ${directory:service}/dnsmasq
-mode = 0775
-hash-files =
-  ${dnsmasq-config:output}
-
-#[dnsmasq-listen-promise]
-#<= monitor-promise-base
-#promise = check_socket_listening
-#name = dnsmasq-port-listening.py
-#config-host = ${dnsmasq-service:ip}
-#config-port = ${dnsmasq-service:port}
-{% endif %}
-
 [xamari-xlog-script]
 recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
@@ -410,14 +370,6 @@ password = {{ slapparameter_dict['monitor-password'] | string }}
 <= monitor-promise-base
 name = ${:_buildout_section_name_}
 
-[check-sdr-busy.py]
-<= macro.promise
-promise = check_sdr_busy
-config-testing = {{ slapparameter_dict.get("testing", False) }}
-config-sdr = {{ sdr }}
-config-sdr_dev  = 0
-config-dma_chan = 0
-
 [check-baseband-latency.py]
 <= macro.promise
 promise = check_baseband_latency
@@ -433,11 +385,3 @@ output = ${directory:plugins}/check-amarisoft-stats-log.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
-[check-rx-saturated.py]
-<= macro.promise
-promise = check_rx_saturated
-config-testing = {{ slapparameter_dict.get("testing", False) }}
-config-rf-rx-chan-list = {{ list(range(0, int(slapparameter_dict.get('n_antenna_ul', default_n_antenna_ul)))) }}
-config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
-config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
-config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}

software/ors-amarisoft/instance-fdd-lopcomm-enb-input-schema.json

@@ -110,12 +110,6 @@
       "type": "object",
       "default": {}
     },
-    "dnsmasq": {
-      "default": false,
-      "title": "dnsmasq",
-      "description": "dnsmasq",
-      "type": "boolean"
-    },
     "txa0cc00_active": {
       "title": "Lopcomm ORAN TX array carriers (TXA0CC00)",
       "description": "Activate or inactivate Lopcomm ORAN TX array carriers (TXA0CC00)",

software/ors-amarisoft/instance-tdd-m2ru-enb-input-schema.json

@@ -120,12 +120,6 @@
       "type": "object",
       "default": {}
     },
-    "dnsmasq": {
-      "default": false,
-      "title": "dnsmasq",
-      "description": "dnsmasq",
-      "type": "boolean"
-    },
     "enb_id": {
       "title": "eNB ID",
       "description": "eNB ID",

software/ors-amarisoft/instance.cfg

@@ -297,7 +297,7 @@ extra-context =
     raw default_lte_inactivity_timer ${default-params:default-lte-inactivity-timer}
     raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
     raw default_n_antenna_ul ${default-params:default-n-antenna-ul}
-    raw dnsmasq_template   ${dnsmasq-enb.jinja2.cfg:target}
+    raw ru_dnsmasq_template  ${ru_dnsmasq.jinja2.cfg:target}
     raw dnsmasq_location ${dnsmasq:location}
     raw fluent_bit_location ${fluent-bit:location}
     raw openssh_location ${openssh:location}

software/ors-amarisoft/ru/buildout.cfg

@@ -14,6 +14,9 @@ parts +=
 [ru_libinstance.jinja2.cfg]
 <= download-base
 
+[ru_dnsmasq.jinja2.cfg]
+<= download-base
+
 [ru_tapsplit]
 <= download-base
 

software/ors-amarisoft/config/dnsmasq-enb.jinja2.cfg → software/ors-amarisoft/ru/dnsmasq.jinja2.cfg

-{% if ru == "lopcomm" %}
 dhcp-leasefile={{ directory['etc'] }}/dnsmasq.leases
 port=5354
 
@@ -22,4 +21,3 @@ ra-param=adv-send-advert
 ra-param=adv-managed-flag
 ra-param=adv-other-config-flag
 ra-param=adv-autonomous
-{% endif %}

software/ors-amarisoft/ru/libinstance.jinja2.cfg

@@ -113,12 +113,78 @@ init =
 {%- endfor %}
 
 
-{#-   go through all RUs and for each RU invoke
+{#-   provide CPRI-based RUs IP address via DHCP #}
+{%-   if trx == 'cpri'  %}
+[dnsmasq-config]
+recipe = slapos.recipe.template:jinja2
+url = {{ru_dnsmasq_template}}
+filename = dnsmasq.cfg
+extensions = jinja2.ext.do
+output = ${directory:etc}/${:filename}
+context =
+  import json_module json
+  import netaddr netaddr
+  section directory directory
+  section vtap_jdict vtap_jdict
+  json cell_list {{ cell_list | tojson }}
+
+{{ part('dnsmasq-service') }}
+recipe = slapos.cookbook:wrapper
+port = 5353
+ip = ${slap-configuration:tun-ipv4-addr}
+command-line = {{ dnsmasq_location }}/sbin/dnsmasq --conf-file=${dnsmasq-config:output} -x ${directory:run}/dnsmasq.pid --local-service --keep-in-foreground
+wrapper-path = ${directory:service}/dnsmasq
+mode = 0775
+hash-files =
+  ${dnsmasq-config:output}
+
+# {# promise('dnsmasq-listen') #}
+#promise = check_socket_listening
+#config-host = ${dnsmasq-service:ip}
+#config-port = ${dnsmasq-service:port}
+{%-   endif  %}
+
+
+{#-   go through all RUs and for each RU emit generic promises and invoke
       RU-specific buildout handler #}
 {%-   set ru_type = {'lopcomm': 'lopcomm', 'm2ru': 'sunwave'}.get(ru, 'sdr') %}
 {%-   set rudrv = rudrv_dict[ru_type] %}
-{%-   for cell_ref, cell in cell_list|dictsort %}
+{%-   for i, (cell_ref, cell) in enumerate(cell_list|dictsort) %}
 {%-     set ru_ref = cell_ref  if cell_ref != 'default'  else 'RU' %}
+{%-     set n_antenna_ul = int(slapparameter_dict.get('n_antenna_ul', default_n_antenna_ul))  %}
+
+# {{ ru_ref }}  ({{ ru_type}})
+{%-     if trx == 'sdr'  %}
+{{ promise('%s-sdr-busy' % ru_ref) }}
+promise = check_sdr_busy
+config-sdr = {{ sdr }}
+config-sdr_dev  = 0
+config-dma_chan = 0
+
+{%-     elif trx == 'cpri'  %}
+{{ promise('%s-sdr-busy' % ru_ref) }}
+promise = check_sdr_busy
+config-sdr = {{ sdr }}
+config-sdr_dev  = {{ slapparameter_dict.get('sdr_number', 0) }}
+config-dma_chan = {{ cell.cpri_port_number }}
+
+{{ promise('%s-cpri-lock' % ru_ref) }}
+promise = check_cpri_lock
+config-sdr_dev  = {{ slapparameter_dict.get('sdr_number', 0) }}
+config-sfp_port = {{ cell.cpri_port_number }}
+config-amarisoft-rf-info-log = ${amarisoft-rf-info-template:log-output}
+
+{%-     else %}
+{%-       do bug('unreachable') %}
+{%-     endif %}
+
+{{ promise('%s-rx-saturated' % ru_ref) }}
+promise = check_rx_saturated
+config-rf-rx-chan-list = {{ list(range(i*n_antenna_ul, (i+1)*n_antenna_ul)) }}
+config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
+config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}
+
+{#-     driver-specific part #}
 {{      rudrv.buildout_ru(ru_ref, cell) }}
 {%-   endfor %}
 

software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg

@@ -9,9 +9,6 @@ promise = check_socket_listening
 config-host = ${vtap.{{cell._tap}}:gateway}
 config-port = 830
 
-{{ promise('%s-netconf-connection' % ru_ref) }}
-promise = check_command_execute
-config-command = [ -f ${ {{-ru_ref}}-stats-template:is_netconf_connected} ]
 
 {#-  push firmware to RU #}
 
@@ -87,7 +84,7 @@ promise = check_lopcomm_config_log
 config-config-log = ${ {{- ru_ref}}-config-template:log-output}
 
 
-{#-  handle notifications from RU #}
+{#-  handle notifications from RU + keep on touching RU watchdog #}
 
 [{{ru_ref}}-stats-template]
 recipe = slapos.recipe.template:jinja2
@@ -129,6 +126,10 @@ mode = 0775
 hash-files =
   ${:command-line}
 
+{{ promise('%s-netconf-connection' % ru_ref) }}
+promise = check_command_execute
+config-command = [ -f ${ {{-ru_ref}}-stats-template:is_netconf_connected} ]
+
 {{ promise('%s-vswr' % ru_ref) }}
 promise = check_lopcomm_vswr
 config-netconf-log = ${ {{- ru_ref}}-stats-template:json-log-output}
@@ -157,12 +158,6 @@ config-netconf-log = ${ {{- ru_ref}}-stats-template:json-log-output}
 promise = check_lopcomm_stats_log
 config-stats-log = ${ {{- ru_ref}}-stats-template:log-output}
 
-{{ promise('%s-cpri-lock' % ru_ref) }}
-promise = check_cpri_lock
-config-sdr_dev  = {{ slapparameter_dict.get('sdr_number', 0) }}
-config-sfp_port = {{ cell.cpri_port_number }}
-config-amarisoft-rf-info-log = ${amarisoft-rf-info-template:log-output}
-
 
 {#-  reset RU periodically #}
 

software/ors-amarisoft/ru/lopcomm/supervision.jinja2.py

-#!{{ python_path }}
-import time
-import json
-import xmltodict
-import sys
-import re
-import os
-sys.path.append({{ repr(buildout_directory_path) }})
-from ncclient_common import LopcommNetconfClient
-
-if __name__ == '__main__':
-    nc = LopcommNetconfClient(
-        log_file="{{ log_file }}",
-        supervision_reply_json_log_file="{{ supervision_reply_json_log_file }}"
-    )
-    try:
-        netconf_check_file = '{{ is_netconf_connected }}'
-        nc.connect("{{ netaddr.IPAddress(vtap.gateway) }}", 830, "oranuser", "oranpassword")
-
-        supervision_subscription_rpc_xml = """
-            <create-subscription xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0">
-                <stream>o-ran-supervision</stream>
-            </create-subscription>
-        """
-        nc.logger.info("Subscription creating...")
-        supervision_subscription_reply_xml = nc.custom_rpc_request(supervision_subscription_rpc_xml)
-
-        if supervision_subscription_reply_xml:
-            nc.logger.info("Subscription created")
-            supervision_subscription_data = xmltodict.parse(supervision_subscription_reply_xml)
-            nc.supervision_reply_json_logger.info('', extra={'data': json.dumps(supervision_subscription_data)})
-            while True:
-              supervision_watchdog_rpc_xml = """
-                  <supervision-watchdog-reset xmlns="urn:o-ran:supervision:1.0">
-                          <supervision-notification-interval>60</supervision-notification-interval>
-                          <guard-timer-overhead>10</guard-timer-overhead>
-                  </supervision-watchdog-reset>
-              """
-              nc.logger.info("NETCONF server replying...")
-              supervision_watchdog_reply_xml = nc.custom_rpc_request(supervision_watchdog_rpc_xml)
-              if supervision_watchdog_reply_xml:
-                  if not os.path.exists(netconf_check_file):
-                      open(netconf_check_file, "w").write('True')
-                      nc.logger.info("NETCONF server replied")
-                      
-                      supervision_watchdog_data = xmltodict.parse(supervision_watchdog_reply_xml)
-                      nc.supervision_reply_json_logger.info('', extra={'data': json.dumps(supervision_watchdog_data)})
-                      # It must be the same interval as <supervision-notification-interval>
-                      time.sleep(60)
-                  else:
-                      if os.path.exists(netconf_check_file):
-                          os.remove(netconf_check_file)
-
-        else:
-          nc.logger.debug("Subscription failed.")
-
-    except Exception as e:
-        nc.logger.debug('Got exception, waiting 10 seconds before reconnecting...')
-        nc.logger.debug(str(e))
-        time.sleep(10)
-    finally:
-        nc.close()
\ No newline at end of file

software/ors-amarisoft/software-base.cfg

@@ -24,7 +24,6 @@ parts +=
 # copy all configs by default
   mme.jinja2.cfg
   dnsmasq-core-network.jinja2.cfg
-  dnsmasq-enb.jinja2.cfg
   ims.jinja2.cfg
   enb.jinja2.cfg
   gnb.jinja2.cfg
@@ -136,8 +135,6 @@ filename = ue_db.jinja2.cfg
 filename = mme.jinja2.cfg
 [dnsmasq-core-network.jinja2.cfg]
 <= copy-config-to-instance
-[dnsmasq-enb.jinja2.cfg]
-<= copy-config-to-instance
 [ims.jinja2.cfg]
 <= copy-config-to-instance
 filename = ims.jinja2.cfg

software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test_file_list_plugin.txt

@@ -3,6 +3,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -16,6 +17,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -32,6 +34,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestMasterRequest.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestReplicateSlave.test_file_list_plugin.txt

@@ -8,6 +8,7 @@ T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-2.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -21,6 +22,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -37,6 +39,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py
@@ -62,6 +65,7 @@ T-3/etc/plugin/backend_haproxy_https.py
 T-3/etc/plugin/buildout-T-3-status.py
 T-3/etc/plugin/caucase-updater.py
 T-3/etc/plugin/check-free-disk-space.py
+T-3/etc/plugin/check-monitor-frontend-password.py
 T-3/etc/plugin/expose-csr-ip-port-listening.py
 T-3/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-3/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestSlave.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestSlaveHttp3.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_plugin.txt

@@ -7,6 +7,7 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
 T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
@@ -20,6 +21,7 @@ T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py
 T-1/etc/plugin/caucased.py
 T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
 T-1/etc/plugin/expose-csr-ip-port-listening.py
 T-1/etc/plugin/kedifa-http-reply.py
 T-1/etc/plugin/monitor-bootstrap-status.py
@@ -36,6 +38,7 @@ T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
 T-2/etc/plugin/frontend_haproxy_ipv4_http.py

stack/monitor/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [monitor2-template]
 filename = instance-monitor.cfg.jinja2.in
-md5sum = dda9b2355134517dae601cc20709685a
+md5sum = 3850140a4e61349cc64fa924ce410803
 
 [monitor-httpd-conf]
 _update_hash_filename_ = templates/monitor-httpd.conf.in

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

@@ -423,9 +423,7 @@ depends =
   ${ca-monitor-httpd-service:wrapper-path}
   ${monitor-httpd-promise:name}
   ${monitor-frontend-promise:name}
-# XXX this is not enabled yet because this conflicts with testnode's own
-# monitoring.
-#  ${check-monitor-password-promise:name}
+  ${check-monitor-password-promise:name}
   ${monitor-bootstrap-promise:name}
   ${monitor-symlink:recipe}
   ${promise-check-slapgrid:recipe}

stack/slapos.cfg

@@ -300,7 +300,7 @@ simplegeneric = 0.8.1
 singledispatch = 3.4.0.3
 six = 1.16.0
 slapos.cookbook = 1.0.329
-slapos.core = 1.10.5
+slapos.core = 1.10.6
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.25
 slapos.rebootstrap = 4.5
@@ -353,6 +353,13 @@ zope.interface = 5.4.0
 zope.testing = 4.7
 zope.testrunner = 5.2
 
+# this is mostly needed for slapos-node
+# it can be removed when slapos-node uses current python3
+[versions:sys.version_info < (3,8)]
+Flask = 1.1.2
+MarkupSafe = 2.0.1
+typing-extensions = 4.7.1:whl
+Werkzeug = 2.0.2
 
 [versions:python2]
 attrs = 18.2.0