diff --git a/software/erp5/instance.cfg b/software/erp5/instance.cfg index dc14bbf667ecb9b1eb47621e89b64aa800803ceb..8722684456826b70b01d439a3489f15aad0fb702 100644 --- a/software/erp5/instance.cfg +++ b/software/erp5/instance.cfg @@ -66,6 +66,7 @@ recipe = slapos.cookbook:generate.erp5.tidstorage snippet-zeo = ${template-snippet-zeo:output} snippet-zope = ${template-snippet-zope:output} snippet-master = ${template-snippet-master:output} +snippet-backend = ${template-snippet-backend:output} [switch-softwaretype] recipe = slapos.cookbook:softwaretype diff --git a/software/erp5/snippet-backend.cfg b/software/erp5/snippet-backend.cfg new file mode 100644 index 0000000000000000000000000000000000000000..3ed5d99ebc7d337aaed7f8acb031f1ddfcdb5517 --- /dev/null +++ b/software/erp5/snippet-backend.cfg @@ -0,0 +1,35 @@ +[apache-zope-backend-instance] +recipe = slapos.cookbook:apache.zope.backend +backend = http://$${zope-instance:ip}:$${zope-instance:port}/ +ip = $${slap-network-information:global-ipv6} +port = 16001 +wrapper = $${rootdirectory:bin}/apache +key-file = $${directory:apache-conf}/apache.key +cert-file = $${directory:apache-conf}/apache.crt +configuration-file = $${directory:apache-conf}/apache.conf +access-control-string = $${slap-parameter:access-control-string} +pid-file = $${basedirectory:run}/apache.pid +lock-file = $${basedirectory:run}/apache.lock +error-log = $${basedirectory:log}/apache-error.log +access-log = $${basedirectory:log}/apache-access.log +apache-binary = ${apache:location}/bin/httpd + +[ca-apache-zope-backend] +<= certificate-authority +recipe = slapos.cookbook:certificate_authority.request +key-file = $${apache-zope-backend-instance:key-file} +cert-file = $${apache-zope-backend-instance:cert-file} +executable = $${apache-zope-backend-instance:wrapper} +wrapper = $${basedirectory:services}/apache + +[logrotate-entry-apache-zope-backend] +<= logrotate +recipe = slapos.cookbook:logrotate.d +name = zope +log = $${apache-zope-backend-instance:error-log} $${apache-zope-backend-instance:access-log} +frequency = daily +rotate-num = 30 +post = ${buildout:bin-directory}/killpidfromfile $${apache-zope-backend-instance:pid-file} SIGUSR1 +sharedscripts = true +notifempty = true +create = true diff --git a/software/erp5/snippet-zope.cfg b/software/erp5/snippet-zope.cfg index 89f42dcc6974818d8861220a5c2237b2c10ed34a..adba04e7a5155abbb4bad4482d4b7ae910aaed63 100644 --- a/software/erp5/snippet-zope.cfg +++ b/software/erp5/snippet-zope.cfg @@ -1,27 +1,3 @@ -[apache-zope-backend-instance] -recipe = slapos.cookbook:apache.zope.backend -backend = http://$${zope-instance:ip}:$${zope-instance:port}/ -ip = $${slap-network-information:global-ipv6} -port = 16001 -wrapper = $${rootdirectory:bin}/apache -key-file = $${directory:apache-conf}/apache.key -cert-file = $${directory:apache-conf}/apache.crt -configuration-file = $${directory:apache-conf}/apache.conf -access-control-string = $${slap-parameter:access-control-string} -pid-file = $${basedirectory:run}/apache.pid -lock-file = $${basedirectory:run}/apache.lock -error-log = $${basedirectory:log}/apache-error.log -access-log = $${basedirectory:log}/apache-access.log -apache-binary = ${apache:location}/bin/httpd - -[ca-apache-zope-backend] -<= certificate-authority -recipe = slapos.cookbook:certificate_authority.request -key-file = $${apache-zope-backend-instance:key-file} -cert-file = $${apache-zope-backend-instance:cert-file} -executable = $${apache-zope-backend-instance:wrapper} -wrapper = $${basedirectory:services}/apache - [%(zope_id)s] recipe = slapos.cookbook:generic.zope @@ -69,15 +45,3 @@ post = ${buildout:bin-directory}/killpidfromfile $${%(zope_id)s:pid-file} SIGUSR sharedscripts = true notifempty = true create = true - -[logrotate-entry-apache-zope-backend] -<= logrotate -recipe = slapos.cookbook:logrotate.d -name = zope -log = $${apache-zope-backend-instance:error-log} $${apache-zope-backend-instance:access-log} -frequency = daily -rotate-num = 30 -post = ${buildout:bin-directory}/killpidfromfile $${apache-zope-backend-instance:pid-file} SIGUSR1 -sharedscripts = true -notifempty = true -create = true diff --git a/software/erp5/software.cfg b/software/erp5/software.cfg index ab726ab61b3f583a1f2c7f0b044d85e00eb507f4..195d90ddebc849e52445480a7d57a8077890510e 100644 --- a/software/erp5/software.cfg +++ b/software/erp5/software.cfg @@ -68,7 +68,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal [template] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg -md5sum = e4e65392a1979b82a454b72eb9dec9eb +md5sum = 2ad8b538cb3c812f497cdba7116d0d6a output = ${buildout:directory}/template.cfg mode = 0644 @@ -103,10 +103,17 @@ mode = 0644 [template-snippet-zope] recipe = slapos.recipe.template url = ${:_profile_base_location_}/snippet-zope.cfg -md5sum = 658c5e4725d76c6cf5af8a01f1e58097 +md5sum = db7a9fa737644f3fafa5fe3dbd855b4a output = ${buildout:directory}/template-snippet-zope.cfg mode = 0644 +[template-snippet-backend] +recipe = slapos.recipe.template +url = ${:_profile_base_location_}/snippet-backend.cfg +md5sum = 8105ea278fc00549a4f5a12eba14cae0 +output = ${buildout:directory}/template-snippet-backend.cfg +mode = 0644 + [validator] # Default json schema for instance parameters. recipe = slapos.recipe.template