diff --git a/software/erp5testnode/buildout.hash.cfg b/software/erp5testnode/buildout.hash.cfg index 6bdf1240cafda87d9daa7a87f7af028e18785855..da3fe2f6c83b829727aa1b2cd7f3b87b6bb703c9 100644 --- a/software/erp5testnode/buildout.hash.cfg +++ b/software/erp5testnode/buildout.hash.cfg @@ -18,4 +18,4 @@ md5sum = 307663d73ef3ef94b02567ecd322252e [template-default] filename = instance-default.cfg -md5sum = 40364ff26e9284cea97a58f3cd8c75e3 +md5sum = e553b582cd51db90fcd5634bd055f042 diff --git a/software/erp5testnode/instance-default.cfg b/software/erp5testnode/instance-default.cfg index 49716959c4d7e6a1f8e3ae7af02fefa8547c7a93..82a404827dbb6d29b531ce0fd0a2ae5dcf668aca 100644 --- a/software/erp5testnode/instance-default.cfg +++ b/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 =