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

fixup! caddy-frontend: Implement ssl_ca_crt

parent cb3dd3a6
...@@ -30,7 +30,7 @@ md5sum = a0110d0ec69875946a16ac3a4b269eb8 ...@@ -30,7 +30,7 @@ md5sum = a0110d0ec69875946a16ac3a4b269eb8
[template-slave-list] [template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in filename = templates/apache-custom-slave-list.cfg.in
md5sum = 47ad8fc21b2b9cbf8c01cff15472f1a4 md5sum = 69992ad1dffe1c23237f3ef97193c95c
[template-slave-configuration] [template-slave-configuration]
filename = templates/custom-virtualhost.conf.in filename = templates/custom-virtualhost.conf.in
...@@ -46,7 +46,7 @@ md5sum = 7c987ad75fcce6f5b925c7696ff41971 ...@@ -46,7 +46,7 @@ md5sum = 7c987ad75fcce6f5b925c7696ff41971
[template-custom-slave-list] [template-custom-slave-list]
filename = templates/apache-custom-slave-list.cfg.in filename = templates/apache-custom-slave-list.cfg.in
md5sum = 47ad8fc21b2b9cbf8c01cff15472f1a4 md5sum = 69992ad1dffe1c23237f3ef97193c95c
[caddy-backend-url-validator] [caddy-backend-url-validator]
filename = templates/caddy-backend-url-validator.in filename = templates/caddy-backend-url-validator.in
......
...@@ -189,7 +189,7 @@ extra-context = ...@@ -189,7 +189,7 @@ extra-context =
< = jinja2-template-base < = jinja2-template-base
template = {{ empty_template }} template = {{ empty_template }}
rendered = {{ cert_file }} rendered = {{ cert_file }}
cert-content = {{ dumps(slave_instance.get('ssl_crt') + slave_instance.get('ssl_ca_crt', '')) }} cert-content = {{ dumps(slave_instance.get('ssl_crt') + '\n' + slave_instance.get('ssl_ca_crt', '')) }}
extra-context = extra-context =
key content :cert-content key content :cert-content
{% endif %} {% endif %}
......
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