From 64f0a7c6f056dd09d80647ea3c5f6382ba19b745 Mon Sep 17 00:00:00 2001 From: Vincent Bechu <vincent.bechu@nexedi.com> Date: Wed, 15 Mar 2017 15:58:48 +0100 Subject: [PATCH] [HARCODED] --- software/erp5testnode/instance-default.cfg | 14 -------------- software/erp5testnode/software.cfg | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/software/erp5testnode/instance-default.cfg b/software/erp5testnode/instance-default.cfg index 00081c177..e50081a83 100644 --- a/software/erp5testnode/instance-default.cfg +++ b/software/erp5testnode/instance-default.cfg @@ -16,13 +16,11 @@ parts = ca-httpd-testnode monitor-base monitor-publish - testnode-frontend [monitor-publish] recipe = slapos.cookbook:publish url = http://[$${shellinabox:ipv6}]:$${shellinabox:port}/ password = $${pwgen:passwd} -frontend-url = $${testnode-frontend:connection-secure_access} [pwgen] recipe = slapos.cookbook:generate.password @@ -162,18 +160,6 @@ software = $${rootdirectory:srv}/software shellinabox = $${rootdirectory:srv}/shellinabox ca-dir = $${rootdirectory:srv}/ca -[testnode-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 - [slap-parameter] node-quantity = 1 test-suite-master-url = diff --git a/software/erp5testnode/software.cfg b/software/erp5testnode/software.cfg index 90e4898c6..d5c52912f 100644 --- a/software/erp5testnode/software.cfg +++ b/software/erp5testnode/software.cfg @@ -56,7 +56,7 @@ recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-default.cfg output = ${buildout:directory}/template-default.cfg mode = 0644 -md5sum = 6e11231618445c05128c95cc26165987 +md5sum = b7f78b90875b1d4bfdbf44487c05ca66 [versions] PyXML = 0.8.5 -- 2.30.9