Commit 02839614 authored by Łukasz Nowak's avatar Łukasz Nowak

Allow to template backend_path.

parent 3cf5e655
...@@ -15,7 +15,7 @@ apache-binary = ${apache:location}/bin/httpd ...@@ -15,7 +15,7 @@ apache-binary = ${apache:location}/bin/httpd
[apache-%(backend_name)s] [apache-%(backend_name)s]
recipe = slapos.cookbook:apache.zope.backend recipe = slapos.cookbook:apache.zope.backend
backend = http://$${haproxy-%(backend_name)s:ip}:$${haproxy-%(backend_name)s:port}/ backend = http://$${haproxy-%(backend_name)s:ip}:$${haproxy-%(backend_name)s:port}
ip = $${slap-network-information:global-ipv6} ip = $${slap-network-information:global-ipv6}
port = %(apache_port)s port = %(apache_port)s
wrapper = $${rootdirectory:bin}/apache-%(backend_name)s wrapper = $${rootdirectory:bin}/apache-%(backend_name)s
...@@ -31,6 +31,7 @@ error-log = $${basedirectory:log}/apache-%(backend_name)s-error.log ...@@ -31,6 +31,7 @@ error-log = $${basedirectory:log}/apache-%(backend_name)s-error.log
access-log = $${basedirectory:log}/apache-%(backend_name)s-access.log access-log = $${basedirectory:log}/apache-%(backend_name)s-access.log
apache-binary = ${apache:location}/bin/httpd apache-binary = ${apache:location}/bin/httpd
ssl-authentication = %(ssl_authentication)s ssl-authentication = %(ssl_authentication)s
backend-path = %(backend_path)s
# Note: Without erp5-certificate-authority main certificate have to be hardcoded # Note: Without erp5-certificate-authority main certificate have to be hardcoded
ssl-authentication-certificate = $${erp5-certificate-authority:ca-dir}/cacert.pem ssl-authentication-certificate = $${erp5-certificate-authority:ca-dir}/cacert.pem
ssl-authentication-crl = $${erp5-certificate-authority:ca-crl} ssl-authentication-crl = $${erp5-certificate-authority:ca-crl}
......
...@@ -136,7 +136,7 @@ mode = 0644 ...@@ -136,7 +136,7 @@ mode = 0644
[template-snippet-backend] [template-snippet-backend]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/snippet-backend.cfg url = ${:_profile_base_location_}/snippet-backend.cfg
md5sum = 6de1a4673654a20c5122b901880ea4f2 md5sum = 3a1b359b57bf21a226bb96c0c18f1924
output = ${buildout:directory}/template-snippet-backend.cfg output = ${buildout:directory}/template-snippet-backend.cfg
mode = 0644 mode = 0644
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment