Testnode frontend for logs

Fix for #20200514-218C705 - \[testnode\] frontend for log access

Depends on nexedi/erp5!1304

See merge request nexedi/slapos!848

slapos/recipe/erp5testnode/__init__.py

@@ -58,7 +58,6 @@ class Recipe(GenericBaseRecipe):
           "\npath_list = %s" % ",".join(software_path_list) 
     CONFIG['computer_id'] = self.buildout['slap-connection']['computer-id']
     CONFIG['server_url'] = self.buildout['slap-connection']['server-url']
-    CONFIG['frontend_url'] = self.buildout['testnode-frontend']['connection-secure_access']
     configuration_file = self.createFile(
       self.options['configuration-file'],
       self.substituteTemplate(

slapos/recipe/erp5testnode/template/erp5testnode.cfg.in

@@ -20,6 +20,7 @@ httpd_software_access_port = %(httpd_software_access_port)s
 computer_id = %(computer_id)s
 server_url = %(server_url)s
 frontend_url = %(frontend_url)s
+log_frontend_url = %(log_frontend_url)s
 keep_log_days = %(keep_log_days)s
 
 # Binaries

software/erp5testnode/buildout.hash.cfg

@@ -18,4 +18,4 @@ md5sum = 307663d73ef3ef94b02567ecd322252e
 
 [template-default]
 filename = instance-default.cfg
-md5sum = 40364ff26e9284cea97a58f3cd8c75e3
+md5sum = e553b582cd51db90fcd5634bd055f042

software/erp5testnode/instance-default.cfg

@@ -23,6 +23,7 @@ parts =
 recipe = slapos.cookbook:publish
 url = $${shellinabox-frontend:url}
 frontend-url = $${testnode-frontend:connection-secure_access}
+log-frontend-url = $${testnode-log-frontend:connection-secure_access}
 
 [pwgen]
 recipe = slapos.cookbook:generate.password
@@ -63,6 +64,8 @@ httpd-log-directory = $${basedirectory:log}
 httpd-software-directory = $${directory:software}
 httpd-cert-file = $${rootdirectory:etc}/httpd-public.crt
 httpd-key-file = $${rootdirectory:etc}/httpd-private.key
+frontend-url = $${testnode-frontend:connection-secure_access}
+log-frontend-url = $${testnode-log-frontend:connection-secure_access}
 
 configuration-file = $${rootdirectory:etc}/erp5testnode.cfg
 log-file = $${basedirectory:log}/erp5testnode.log
@@ -212,22 +215,31 @@ recipe = collective.recipe.template
 input = inline: **
 output = $${directory:srv}/exporter.exclude
 
-[testnode-frontend]
+[request-shared-frontend]
 <= slap-connection
 recipe = slapos.cookbook:requestoptional
-name = Test Node Frontend $${testnode:test-node-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
-config-url = https://[$${testnode:httpd-ip}]:$${testnode:httpd-software-access-port}
 config-https-only = true
-#software-type = custom-personal
 return = domain secure_access
 
+[testnode-frontend]
+<= request-shared-frontend
+name = Test Node Frontend $${testnode:test-node-title}
+config-url = https://[$${testnode:httpd-ip}]:$${testnode:httpd-software-access-port}
+
+[testnode-log-frontend]
+<= request-shared-frontend
+name = Test Node Logs Frontend $${testnode:test-node-title}
+config-url = https://[$${testnode:httpd-ip}]:$${testnode:httpd-port}
+
+
 [promises]
 recipe =
 instance-promises =
   $${shellinabox-frontend-listen-promise:name}
+  $${testnode-log-frontend-promise:name}
 
 [shellinabox-frontend-listen-promise]
 <= monitor-promise-base
@@ -236,6 +248,12 @@ name = $${:_buildout_section_name_}.py
 config-hostname = $${shellinabox-frontend:hostname}
 config-port = $${shellinabox-frontend:port}
 
+[testnode-log-frontend-promise]
+<= monitor-promise-base
+module = check_url_available
+name = $${:_buildout_section_name_}.py
+config-url = $${testnode-log-frontend:connection-secure_access}
+
 [slap-parameter]
 node-quantity = 1
 test-suite-master-url =