Skip to content
Browse files

Allow login url to be specified in cc

Explanation: the UAA used to do everything, then we broke
out authentication into the Login Server quite some time ago.
For backwards compatibility we kept it in the UAA, but we
need to retire that feature.  And the cloud controller needs
to point at the Login Server (if there is one) for anything
that needs user authentication (including vmc).
  • Loading branch information...
1 parent 3c376d1 commit e71731d0029d5a25ba8fa258dbacd93faca9982a @dsyer dsyer committed with d Feb 15, 2013
View
8 jobs/cloud_controller/templates/cloud_controller.yml.erb
@@ -96,20 +96,22 @@ database_environment:
template: template0 # Required for utf8 encoding
adapter: postgresql
-<% schema = properties.uaa.no_ssl ? "http" : "https" %>
+<% scheme = properties.uaa.no_ssl ? "http" : "https" %>
+login:
+ url: <%= scheme %>://login.<%= properties.domain %>
<% if cc_props.uaa && properties.uaa.cc %>
uaa:
enabled: <%= cc_props.uaa.enabled %>
- url: <%= schema %>://uaa.<%= properties.domain %>
+ url: <%= scheme %>://uaa.<%= properties.domain %>
resource_id: <%= cc_props.uaa.resource_id %>
token_secret: <%= properties.uaa.cc.token_secret %>
client_secret: <%= properties.uaa.cc.client_secret %>
token_creation_email_filter: <%= cc_props.uaa.token_creation_email_filter %>
<% else %>
uaa:
enabled: false
- url: <%= schema %>://uaa.<%= properties.domain %>
+ url: <%= scheme %>://uaa.<%= properties.domain %>
resource_id: cloud_controller
token_secret:
client_secret:
View
6 jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb
@@ -70,8 +70,12 @@ redis:
password: <%= password %>
<% end %>
+<% scheme = properties.uaa.no_ssl ? "http" : "https" %>
+
+login:
+ url: <%= scheme %>://login.<%= p("domain") %>
uaa:
- url: http://uaa.<%= p("domain") %>
+ url: <%= scheme %>://uaa.<%= p("domain") %>
resource_id: <%= p("ccng.uaa_resource_id") %>
symmetric_secret: <%= p("uaa.cc.token_secret") %>
verification_key: <%= p("uaa.jwt.verification_key") ? ("|\n " + p("uaa.jwt.verification_key").gsub("\n", "\n ")) : '~' %>

0 comments on commit e71731d

Please sign in to comment.
Something went wrong with that request. Please try again.