Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
fdbfc49e
Commit
fdbfc49e
authored
Nov 20, 2018
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! caddy-frontend: Implement ssl_ca_crt
parent
cb3dd3a6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+2
-2
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
.../caddy-frontend/templates/apache-custom-slave-list.cfg.in
+1
-1
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
fdbfc49e
...
...
@@ -30,7 +30,7 @@ md5sum = a0110d0ec69875946a16ac3a4b269eb8
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
md5sum =
47ad8fc21b2b9cbf8c01cff15472f1a4
md5sum =
69992ad1dffe1c23237f3ef97193c95c
[template-slave-configuration]
filename = templates/custom-virtualhost.conf.in
...
...
@@ -46,7 +46,7 @@ md5sum = 7c987ad75fcce6f5b925c7696ff41971
[template-custom-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
md5sum =
47ad8fc21b2b9cbf8c01cff15472f1a4
md5sum =
69992ad1dffe1c23237f3ef97193c95c
[caddy-backend-url-validator]
filename = templates/caddy-backend-url-validator.in
...
...
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
View file @
fdbfc49e
...
...
@@ -189,7 +189,7 @@ extra-context =
< = jinja2-template-base
template = {{ empty_template }}
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 =
key content :cert-content
{% endif %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment