Skip to content

Commit

Permalink
Add CONCOURSE_TLS_CA_CERT flag
Browse files Browse the repository at this point in the history
added in concourse/concourse#6355

Signed-off-by: Taylor Silva <tsilva@pivotal.io>
  • Loading branch information
taylorsilva committed Feb 11, 2021
1 parent 0131d68 commit 2bce683
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions jobs/web/spec
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ properties:
env_fields:
certificate: {env_file: CONCOURSE_TLS_CERT}
private_key: {env_file: CONCOURSE_TLS_KEY}
ca: {env_file: CONCOURSE_TLS_CA_CERT}
description: |
SSL cert to use for HTTPS.
Expand Down
4 changes: 4 additions & 0 deletions jobs/web/templates/bpm.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,10 @@ processes:
CONCOURSE_TLS_BIND_PORT: <%= env_flag(v).to_json %>
<% end -%>
<% if_p("tls.cert.ca") do |v| -%>
CONCOURSE_TLS_CA_CERT: <%= env_file_flag(v, "CONCOURSE_TLS_CA_CERT").to_json %>
<% end -%>
<% if_p("tls.cert.certificate") do |v| -%>
CONCOURSE_TLS_CERT: <%= env_file_flag(v, "CONCOURSE_TLS_CERT").to_json %>
<% end -%>
Expand Down
3 changes: 3 additions & 0 deletions jobs/web/templates/pre_start.erb
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ mkdir -p /var/vcap/jobs/web/config/env
<% if_p("syslog.ca_cert.certificate") do |v| -%>
<%= env_file_writer(v, "CONCOURSE_SYSLOG_CA_CERT") %>
<% end -%>
<% if_p("tls.cert.ca") do |v| -%>
<%= env_file_writer(v, "CONCOURSE_TLS_CA_CERT") %>
<% end -%>
<% if_p("tls.cert.certificate") do |v| -%>
<%= env_file_writer(v, "CONCOURSE_TLS_CERT") %>
<% end -%>
Expand Down

0 comments on commit 2bce683

Please sign in to comment.