diff --git a/software/erp5/instance-erp5-development.cfg b/software/erp5/instance-erp5-development.cfg deleted file mode 100644 index 1664c2c1a01be81a117f6756daf56ec73701118b..0000000000000000000000000000000000000000 --- a/software/erp5/instance-erp5-development.cfg +++ /dev/null @@ -1,129 +0,0 @@ -############################# -# -# Request erp5 development environnment -# -############################# -[buildout] - -extends = ${template-zope:output} -parts += - request-mariadb - request-cloudooo - request-memcached - request-kumofs - basedirectory - erp5-update - test-runner - -eggs-directory = ${buildout:eggs-directory} -develop-eggs-directory = ${buildout:develop-eggs-directory} -offline = true - -[slap-parameter] -# default site id -site-id = erp5 -cloudooo-json = - -[test-runner] -recipe = slapos.cookbook:erp5.test -certificate-authority-path = $${test-certificate-authority:ca-dir} -mysql-url = $${request-mariadb:connection-url} -kumofs-url = $${request-kumofs:connection-url} -memcached-url = $${request-memcached:connection-url} -cloudooo-url = $${request-cloudooo:connection-url} -test-instance-path = $${directory:unit-test-path} - -prepend-path = $${buildout:bin-directory} -run-unit-test = $${buildout:bin-directory}/runUnitTest -run-test-suite = $${buildout:bin-directory}/runTestSuite - -openssl-binary = $${test-certificate-authority:openssl-binary} -run-unit-test-binary = ${buildout:bin-directory}/runUnitTest -run-test-suite-binary = ${buildout:bin-directory}/runTestSuite - -[test-certificate-authority] -recipe = slapos.cookbook:certificate_authority -openssl-binary = ${openssl:location}/bin/openssl -ca-dir = $${directory:test-ca-dir} -requests-directory = $${test-cadirectory:requests} -wrapper = $${basedirectory:services}/test-ca -ca-private = $${test-cadirectory:private} -ca-certs = $${test-cadirectory:certs} -ca-newcerts = $${test-cadirectory:newcerts} -ca-crl = $${test-cadirectory:crl} - -[test-cadirectory] -recipe = slapos.cookbook:mkdirectory -requests = $${directory:test-ca-dir}/requests -private = $${directory:test-ca-dir}/private -certs = $${directory:test-ca-dir}/certs -newcerts = $${directory:test-ca-dir}/newcerts -crl = $${directory:test-ca-dir}/crl - -[erp5-update] -recipe = slapos.cookbook:erp5.update - -# Configuration -url = http://$${zope-instance:user}:$${zope-instance:password}@$${zope-instance:ip}:$${zope-instance:port}/ -mysql-url = $${request-mariadb:connection-url} -kumofs-url = $${request-kumofs:connection-url} -memcached-url = $${request-memcached:connection-url} -cloudooo-url = $${request-cloudooo:connection-url} -site-id = $${slap-parameter:site-id} -openssl-binary = ${openssl:location}/bin/openssl -cadir-path = $${erp5-certificate-authority:ca-dir} - -# Paths -update-wrapper = $${basedirectory:services}/erp5-update - -# Defaults -configurator-bt5-list = erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_ung erp5_configurator_run_my_doc -bt5-repository-list = $${zope-instance:bt5-repository-list} - -[request-common] -recipe = slapos.cookbook:request -software-url = $${slap-connection:software-release-url} -sla = computer_guid -sla-computer_guid = $${slap-connection:computer-id} -return = url -server-url = $${slap-connection:server-url} -key-file = $${slap-connection:key-file} -cert-file = $${slap-connection:cert-file} -computer-id = $${slap-connection:computer-id} -partition-id = $${slap-connection:partition-id} - -[request-mariadb] -<=request-common -name = MariaDB DataBase -software-type = mariadb - -[request-cloudooo] -<=request-common -name = Cloudooo -config = cloudooo-json -config-cloudooo-json = $${slap-parameter:cloudooo-json} -software-type = cloudooo - -[request-memcached] -<=request-common -name = Memcached -software-type = memcached - -[request-kumofs] -<=request-common -name = KumoFS -software-type = kumofs - -# rest of parts are candidates for some generic stuff -[basedirectory] -recipe = slapos.cookbook:mkdirectory -services = $${rootdirectory:etc}/run - -[rootdirectory] -recipe = slapos.cookbook:mkdirectory -etc = $${buildout:directory}/etc - -[directory] -test-ca-dir = $${rootdirectory:srv}/test-ca -test-instance-path = $${rootdirectory:srv}/test-instance -unit-test-path = $${:test-instance-path}/unit_test diff --git a/software/erp5/instance-erp5-development.cfg.in b/software/erp5/instance-erp5-development.cfg.in new file mode 100644 index 0000000000000000000000000000000000000000..abc805b13810ca312bc7c3b213973733b4376353 --- /dev/null +++ b/software/erp5/instance-erp5-development.cfg.in @@ -0,0 +1,129 @@ +############################# +# +# Request erp5 development environnment +# +############################# +[buildout] + +extends = {{ template_zope }} +parts += + request-mariadb + request-cloudooo + request-memcached + request-kumofs + basedirectory + erp5-update + test-runner + +eggs-directory = {{ eggs_directory }} +develop-eggs-directory = {{ develop_eggs_directory }} +offline = true + +[slap-parameter] +# default site id +site-id = erp5 +cloudooo-json = + +[test-runner] +recipe = slapos.cookbook:erp5.test +certificate-authority-path = ${test-certificate-authority:ca-dir} +mysql-url = ${request-mariadb:connection-url} +kumofs-url = ${request-kumofs:connection-url} +memcached-url = ${request-memcached:connection-url} +cloudooo-url = ${request-cloudooo:connection-url} +test-instance-path = ${directory:unit-test-path} + +prepend-path = ${buildout:bin-directory} +run-unit-test = ${buildout:bin-directory}/runUnitTest +run-test-suite = ${buildout:bin-directory}/runTestSuite + +openssl-binary = ${test-certificate-authority:openssl-binary} +run-unit-test-binary = {{ bin_directory }}/runUnitTest +run-test-suite-binary = {{ bin_directory }}/runTestSuite + +[test-certificate-authority] +recipe = slapos.cookbook:certificate_authority +openssl-binary = {{ openssl_location }}/bin/openssl +ca-dir = ${directory:test-ca-dir} +requests-directory = ${test-cadirectory:requests} +wrapper = ${basedirectory:services}/test-ca +ca-private = ${test-cadirectory:private} +ca-certs = ${test-cadirectory:certs} +ca-newcerts = ${test-cadirectory:newcerts} +ca-crl = ${test-cadirectory:crl} + +[test-cadirectory] +recipe = slapos.cookbook:mkdirectory +requests = ${directory:test-ca-dir}/requests +private = ${directory:test-ca-dir}/private +certs = ${directory:test-ca-dir}/certs +newcerts = ${directory:test-ca-dir}/newcerts +crl = ${directory:test-ca-dir}/crl + +[erp5-update] +recipe = slapos.cookbook:erp5.update + +# Configuration +url = http://${zope-instance:user}:${zope-instance:password}@${zope-instance:ip}:${zope-instance:port}/ +mysql-url = ${request-mariadb:connection-url} +kumofs-url = ${request-kumofs:connection-url} +memcached-url = ${request-memcached:connection-url} +cloudooo-url = ${request-cloudooo:connection-url} +site-id = ${slap-parameter:site-id} +openssl-binary = {{ openssl_location }}/bin/openssl +cadir-path = ${erp5-certificate-authority:ca-dir} + +# Paths +update-wrapper = ${basedirectory:services}/erp5-update + +# Defaults +configurator-bt5-list = erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_ung erp5_configurator_run_my_doc +bt5-repository-list = ${zope-instance:bt5-repository-list} + +[request-common] +recipe = slapos.cookbook:request +software-url = ${slap-connection:software-release-url} +sla = computer_guid +sla-computer_guid = ${slap-connection:computer-id} +return = url +server-url = ${slap-connection:server-url} +key-file = ${slap-connection:key-file} +cert-file = ${slap-connection:cert-file} +computer-id = ${slap-connection:computer-id} +partition-id = ${slap-connection:partition-id} + +[request-mariadb] +<=request-common +name = MariaDB DataBase +software-type = mariadb + +[request-cloudooo] +<=request-common +name = Cloudooo +config = cloudooo-json +config-cloudooo-json = ${slap-parameter:cloudooo-json} +software-type = cloudooo + +[request-memcached] +<=request-common +name = Memcached +software-type = memcached + +[request-kumofs] +<=request-common +name = KumoFS +software-type = kumofs + +# rest of parts are candidates for some generic stuff +[basedirectory] +recipe = slapos.cookbook:mkdirectory +services = ${rootdirectory:etc}/run + +[rootdirectory] +recipe = slapos.cookbook:mkdirectory +etc = ${buildout:directory}/etc + +[directory] +test-ca-dir = ${rootdirectory:srv}/test-ca +test-instance-path = ${rootdirectory:srv}/test-instance +unit-test-path = ${:test-instance-path}/unit_test diff --git a/software/erp5/instance.cfg b/software/erp5/instance.cfg index 82d61d9e31ca06046b3f1ecbb91b549c2cdbc38e..e0dfe07267449f0a0e363dba1229203541d5eede 100644 --- a/software/erp5/instance.cfg +++ b/software/erp5/instance.cfg @@ -24,7 +24,7 @@ snippet-fontconfig = ${template-snippet-fontconfig:output} [switch-softwaretype] recipe = slapos.cookbook:softwaretype -default = ${template-erp5-development:output} +default = ${template-erp5-development:rendered} production = ${template-erp5-production:output} kumofs = ${template-kumofs:output} memcached = ${template-memcached:output} diff --git a/software/erp5/software.cfg b/software/erp5/software.cfg index ccd65515f9405a5da7bc615c69bb8e156aeae65e..29a391abd651f8a1bfd531fde6f7318557f95f38 100644 --- a/software/erp5/software.cfg +++ b/software/erp5/software.cfg @@ -112,11 +112,12 @@ output = ${buildout:directory}/template-memcached.cfg mode = 0644 [template-erp5-development] -recipe = slapos.recipe.template -url = ${:_profile_base_location_}/instance-erp5-development.cfg -md5sum = 4bc5a2ec8c04b206dab8b98258a69efd -output = ${buildout:directory}/template-erp5-development.cfg -mode = 0644 +< = template-jinja2-base +filename = instance-erp5-development.cfg +md5sum = f48d9005fc6c667c69d5c9304e4e214e +extra-context = + key openssl_location openssl:location + key template_zope template-zope:output [template-erp5-production] recipe = slapos.recipe.template