diff --git a/software/erp5/instance-erp5-development.cfg b/software/erp5/instance-erp5-development.cfg index 345c6f8748f8a8171d10740b3e630b733af70538..d25e973e827142478d9242cf2916fcfd02b3e64f 100644 --- a/software/erp5/instance-erp5-development.cfg +++ b/software/erp5/instance-erp5-development.cfg @@ -11,7 +11,6 @@ parts = request-cloudooo request-memcached request-kumofs - request-tidstorage basedirectory certificate-authority publish-apache-zope-backend-connection-string @@ -27,6 +26,14 @@ eggs-directory = ${buildout:eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory} offline = true +# support those parameters +#config = json mysql-url memcached-url cloudooo-url kumofs-url +#config-json = $${slap-parameter:json} +#config-mysql-url = $${request-mariadb:connection-url} +#config-memcached-url = $${request-memcached:connection-url} +#config-cloudooo-url = $${request-cloudooo:connection-url} +#config-kumofs-url = $${request-kumofs:connection-url} + [request-common] recipe = slapos.cookbook:request software-url = $${slap-connection:software-release-url} @@ -59,18 +66,6 @@ software-type = memcached name = KumoFS software-type = kumofs -[request-tidstorage] -<=request-common -name = TidStorage -return = url-login -config = json mysql-url memcached-url cloudooo-url kumofs-url -config-json = $${slap-parameter:json} -config-mysql-url = $${request-mariadb:connection-url} -config-memcached-url = $${request-memcached:connection-url} -config-cloudooo-url = $${request-cloudooo:connection-url} -config-kumofs-url = $${request-kumofs:connection-url} -software-type = tidstorage - # rest of parts are candidates for some generic stuff [basedirectory] recipe = slapos.cookbook:mkdirectory diff --git a/software/erp5/software.cfg b/software/erp5/software.cfg index 149a039d24020d83909994da57d39c5ba0266a97..fdd874324893128f5e89dc1ff5acb5dc80dcfd9f 100644 --- a/software/erp5/software.cfg +++ b/software/erp5/software.cfg @@ -60,7 +60,7 @@ mode = 0644 [template-erp5-development] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-erp5-development.cfg -md5sum = fbbc3d6283164c3500c620dd56ab7bab +md5sum = a393e0b5ad3623b280e159006a60f19f output = ${buildout:directory}/template-erp5-development.cfg mode = 0644