Permalink
Browse files

UAA Endpoint http mode

By default, router don't use ssl , so I can't access uaa webservice endpoint via router.
https is not need for test.
Cloud you parameterize uaa endpoint's schema?
- Patch Spec
 - UAA don't use https if properties.uaa.no_ssl == true.
 - By defaul, UAA use https.

Change-Id: Ieca175215a7896646f25e20ecb9a3b4130cb211d
  • Loading branch information...
1 parent c96b9ca commit c591ef16fce33415b7f4dc3a97b9966482a44137 @takeshi takeshi committed with Matthew Kocher and Ryan Tang Jan 14, 2013
Showing with 6 additions and 2 deletions.
  1. +4 −2 jobs/cloud_controller/templates/cloud_controller.yml.erb
  2. +2 −0 jobs/uaa/templates/uaa.yml.erb
@@ -96,18 +96,20 @@ database_environment:
template: template0 # Required for utf8 encoding
adapter: postgresql
+<% schema = properties.uaa.no_ssl ? "http" : "https" %>
+
<% if cc_props.uaa && properties.uaa.cc %>
uaa:
enabled: <%= cc_props.uaa.enabled %>
- url: https://uaa.<%= properties.domain %>
+ url: <%= schema %>://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: https://uaa.<%= properties.domain %>
+ url: <%= schema %>://uaa.<%= properties.domain %>
resource_id: cloud_controller
token_secret:
client_secret:
@@ -39,8 +39,10 @@ jwt:
<% end %>
oauth:
+ <% unless properties.uaa.no_ssl %>
authorize:
ssl: true
+ <% end %>
client:
<% if properties.uaa.client.autoapprove %>
autoapprove: <% properties.uaa.client.autoapprove.each do |client_id| %>

0 comments on commit c591ef1

Please sign in to comment.