Skip to content

Commit

Permalink
Bump to 3.8.0. Fix github-oauth.
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Mitchell committed Dec 13, 2017
1 parent bb441b1 commit 84acc31
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
6 changes: 3 additions & 3 deletions base/properties.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ update:

releases:
- name: concourse
sha1: 20e17e3ac079f1b1a5095329a4fb14de40317bb9
url: https://bosh.io/d/github.com/concourse/concourse?v=3.7.0
version: 3.7.0
sha1: 99e134676df72e18c719ccfbd7977bd9449e6fd4
url: https://bosh.io/d/github.com/concourse/concourse?v=3.8.0
version: 3.8.0
- name: postgres
sha1: 3f378bcab294e20316171d4e656636df88763664
url: https://bosh.io/d/github.com/cloudfoundry/postgres-release?v=20
Expand Down
14 changes: 7 additions & 7 deletions kit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ params:
so that Concourse can then authorize users after they log into GitHub. GitHub refers
to this as the `client_secret`. See https://developer.github.com/v3/oauth/ for more info.
vault: oauth:provider_secret
- ask: What GitHub organizations do you want to grant access to Concourse?
- ask: Which GitHub organization do you want to grant access to Concourse?
description: |
Concourse authorizes access based off of GitHub Organizations. Specify all the
orgs whose users will be given access to Concourse here.
Concourse authorizes access based off of GitHub Organizations. Specify
the Github organization you wish to grant access to Concourse
param: authz_allowed_orgs
- ask: What is the API URL for your GitHub?
description: |
Expand Down Expand Up @@ -95,10 +95,10 @@ params:
so that Concourse can then authorize users after they log into GitHub. GitHub refers
to this as the `client_secret`. See https://developer.github.com/v3/oauth/ for more info.
vault: oauth:provider_secret
- ask: What GitHub organizations do you want to grant access to Concourse?
- ask: Which GitHub organization do you want to grant access to Concourse?
description: |
Concourse authorizes access based off of GitHub Organizations. Specify all the
orgs whose users will be given access to Concourse here.
Concourse authorizes access based off of GitHub Organizations. Specify
the Github organization you wish to grant access to Concourse
param: authz_allowed_orgs

cf-oauth:
Expand All @@ -115,7 +115,7 @@ params:
- ask: What is your CF CA cert path?
description: |
The CF CA cert is used to authenticate Concourse to the UAA,
so that Concourse can then authorize users after they log into the UAA.
so that Concourse can then authorize users after they log into the UAA.
This is usually something like `secret/path/to/keys/for/haproxy/ssl:certificate`
If you are unsure, use `safe tree` to find it. If you are terminating ssl on LBs or
Go routers, you will need cert on those nodes.
Expand Down
4 changes: 3 additions & 1 deletion subkits/github-oauth/properties.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ instance_groups:
basic_auth_username: (( prune ))
basic_auth_password: (( prune ))
github_auth:
authorize: (( grab params.authz_allowed_orgs ))
authorize:
- organization: (( grab params.authz_allowed_orgs ))
teams: all
client_id: (( vault meta.vault "/oauth:provider_key" ))
client_secret: (( vault meta.vault "/oauth:provider_secret" ))

0 comments on commit 84acc31

Please sign in to comment.