Update Release Candidate

software/re6stnet/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 57ddaa585f4755f8e8d1613e5321eefc
 
 [template-re6stnet]
 filename = instance-re6stnet.cfg.in
-md5sum = 01da4462b5e20cab73b87e7415f7483d
+md5sum = afa3bc5d61b46b244cac6f5e5f8c9441
 
 [template-apache-conf]
 filename = apache.conf.in

software/re6stnet/instance-re6stnet.cfg.in

@@ -170,10 +170,19 @@ context =
 [re6st-registry-promise]
 <= monitor-promise-base
 promise = check_socket_listening
-name = re6st-registry.py
+name = check-re6st-registry.py
 config-host = ${re6st-registry:ipv4}
 config-port = ${re6st-registry:port}
 
+[re6st-certificate-promise]
+<= monitor-promise-base
+promise = check_certificate
+name = check-re6st-certificate.py
+config-certificate = ${re6st-registry-conf-dict:ca}
+config-key = ${re6st-registry-conf-dict:key}
+# RENEW_PERIOD is 30 days in re6st, so warn 15 days before all nodes will try to renew
+config-certificate-expiration-days = 45
+
 [apache-registry-promise]
 <= monitor-promise-base
 promise = check_socket_listening
@@ -206,5 +215,6 @@ parts =
   port-redirection
 
   re6st-registry-promise
+  re6st-certificate-promise
   apache-registry-promise
   monitor-base

software/re6stnet/test/test.py

@@ -39,9 +39,23 @@ setUpModule, Re6stnetTestCase = makeModuleSetUpAndTestCaseClass(
 
 
 class TestRe6stnetRegistry(Re6stnetTestCase):
-  def test_listen(self):
+  def test_default(self):
     connection_parameters = self.computer_partition.getConnectionParameterDict()
     registry_url = connection_parameters['re6stry-local-url']
+    promise = os.path.join(
+      self.computer_partition_root_path, 'etc', 'plugin',
+      'check-re6st-certificate.py')
+    self.assertTrue(os.path.exists(promise))
+    with open(promise) as fh:
+      promise_content = fh.read()
+    self.assertIn(
+      """extra_config_dict = { 'certificate': '%(partition_root_dir)s/etc/re6stnet/ssl/re6stnet.crt',
+  'certificate-expiration-days': '45',
+  'key': '%(partition_root_dir)s/etc/re6stnet/ssl/re6stnet.key'}""" % {
+    'partition_root_dir': self.computer_partition_root_path}, promise_content)
+    self.assertIn(
+      "from slapos.promise.plugin.check_certificate import RunPromise",
+      promise_content)
 
     _ = requests.get(registry_url)
 

software/simpleran/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = c1588b160ca830cbd42a295e043d4405
+md5sum = 0a1be770b8ed414344f3d61a09cacb0e
 
 [template-ors]
 filename = instance-ors.cfg

software/simpleran/instance.cfg

@@ -90,7 +90,7 @@ init =
 
 [amarisoft]
 recipe = slapos.recipe.build
-fixed_version = 2024-11-21.1732633257
+fixed_version = 2024-11-21.1734602361
 configuration = $${slap-configuration:configuration}
 init =
   import os, re

stack/slapos.cfg

@@ -138,10 +138,10 @@ eggs =
 # The last version of setuptools compatible with Python 3.7
 setuptools = 67.8.0
 # Use SlapOS patched zc.buildout
-zc.buildout = 3.0.1+slapos007
+zc.buildout = 3.0.1+slapos008
 pip = 23.2.1
 # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
-zc.recipe.egg = 2.0.8.dev0+slapos007
+zc.recipe.egg = 2.0.8.dev0+slapos008
 
 aiofiles = 23.1.0:whl
 aiohttp = 3.8.5:whl