Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Conjur appliance url config #106

Merged
merged 3 commits into from
Jun 11, 2020
Merged

Conjur appliance url config #106

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e863454
Update the webspec to fix conjur.appliance_interval to appliance_url
AndrewCopeland May 27, 2020
ec4aa67
Fix conjur.appliance_interval and ran ./scripts/generate-job-templates
AndrewCopeland May 27, 2020
624cd44
Conjur use environment file of type certificate
AndrewCopeland Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion jobs/web/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1237,7 +1237,7 @@ properties:
description: |
The maximum time between retries when logging in or re-authing a secret.

conjur.appliance_interval:
conjur.appliance_url:
env: CONCOURSE_CONJUR_APPLIANCE_URL
description: |
URL of the Conjur instance.
Expand All @@ -1249,6 +1249,10 @@ properties:
env: CONCOURSE_CONJUR_CERT_FILE
description: |
Path to cert file used if conjur instance is using a self-signed cert.
conjur.ssl_certificate:
env: CONCOURSE_CONJUR_SSL_CERTIFICATE
AndrewCopeland marked this conversation as resolved.
Show resolved Hide resolved
description: |
Content of the SSL cert used if conjur instance is using a self-signed cert.
conjur.auth.login:
env: CONCOURSE_CONJUR_AUTHN_LOGIN
description: |
Expand Down
14 changes: 9 additions & 5 deletions jobs/web/templates/bpm.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ processes:
CONCOURSE_CONJUR_ACCOUNT: <%= env_flag(v).to_json %>
<% end -%>

<% if_p("conjur.appliance_interval") do |v| -%>
<% if_p("conjur.appliance_url") do |v| -%>
CONCOURSE_CONJUR_APPLIANCE_URL: <%= env_flag(v).to_json %>
<% end -%>

Expand Down Expand Up @@ -315,6 +315,10 @@ processes:
CONCOURSE_CONJUR_SECRET_TEMPLATE: <%= env_flag(v).to_json %>
<% end -%>

<% if_p("conjur.ssl_certificate") do |v| -%>
CONCOURSE_CONJUR_SSL_CERTIFICATE: <%= env_flag(v).to_json %>
<% end -%>

<% if_p("conjur.team_secret_template") do |v| -%>
CONCOURSE_CONJUR_TEAM_SECRET_TEMPLATE: <%= env_flag(v).to_json %>
<% end -%>
Expand Down Expand Up @@ -855,10 +859,6 @@ processes:
CONCOURSE_NEWRELIC_API_KEY: <%= env_flag(v).to_json %>
<% end -%>

<% if_p("newrelic.url") do |v| -%>
CONCOURSE_NEWRELIC_INSIGHTS_API_URL: <%= env_flag(v).to_json %>
<% end -%>

<% if_p("newrelic.batch_duration") do |v| -%>
CONCOURSE_NEWRELIC_BATCH_DURATION: <%= env_flag(v).to_json %>
<% end -%>
Expand All @@ -875,6 +875,10 @@ processes:
CONCOURSE_NEWRELIC_SERVICE_PREFIX: <%= env_flag(v).to_json %>
<% end -%>

<% if_p("newrelic.url") do |v| -%>
CONCOURSE_NEWRELIC_INSIGHTS_API_URL: <%= env_flag(v).to_json %>
<% end -%>

<% if_p("old_encryption_key") do |v| -%>
CONCOURSE_OLD_ENCRYPTION_KEY: <%= env_flag(v).to_json %>
<% end -%>
Expand Down