Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

UAA Phase4 changes to release

Change-Id: I7560d066bcf6ca85c0faa66511e7d5f4fd601639
  • Loading branch information...
commit 5053f4ea13c06b77ca6f2df08b3cb84240db251a 1 parent e3651ef
@joeldsa joeldsa authored
View
5 blob_index.yml
@@ -68,9 +68,8 @@ uaa/apache-tomcat-6.0.35.tar.gz:
sha: bc3af89308990be16b12cc7d6b3ff8278a7cda84
size: 6697806
uaa/cloudfoundry-identity-uaa-1.0.0.BUILD-SNAPSHOT.war:
- object_id: eyJvaWQiOiI0ZTRlNzhiY2EzMWUxMjEwMDRlNGU3ZDUxNDc0NWYwNGY2Mzgw%0AMWY2MTU5NSIsInNpZyI6ImNvNnh5TEdSeGt3ZVlZQXNvUS8zZk1XYlloND0i%0AfQ==%0A
- sha: bfee1cf82ce1647893b62e16ae689f4a1ff31d61
- size: 17302353
+ object_id: eyJvaWQiOiI0ZTRlNzhiY2EzMWUxMjIwMDRlNGU4ZWM2NDZlMjEwNGY4ZWYy%0AMGVmMzgyZiIsInNpZyI6Ijk0KzI2VFJvTDJxVWppNHVYMk1ReHVwemwrYz0i%0AfQ==%0A
+ sha: fc432a54a31840f24f02802645a328d187c75bd0
opentsdb/opentsdb.36fe3cc1.tgz:
object_id: eyJvaWQiOiI0ZTRlNzhiY2EyMWUxMjIwMDRlNGU4ZWM2NDdhNTQwNGYzMDY4%0AYjQxODZjMSIsInNpZyI6IkExUkliUy9lQ1dVV0RydEZvSjlDYTVub3VjND0i%0AfQ==%0A
sha: 825cb28918aa5e2c48942558e557d88ab2f34c44
View
4 jobs/cloud_controller/templates/cloud_controller.yml.erb
@@ -88,7 +88,8 @@ uaa:
url: http://uaa.<%= properties.domain %>
resource_id: <%= properties.cc.uaa.resource_id %>
token_secret: <%= properties.uaa.cc.token_secret %>
- client_secret: <%= properties.cc.uaa.client_secret %>
+ client_secret: <%= properties.uaa.cc.client_secret %>
+ token_creation_email_filter: <%= properties.cc.uaa.token_creation_email_filter %>
<% else %>
uaa:
enabled: false
@@ -96,6 +97,7 @@ uaa:
resource_id: cloud_controller
token_secret:
client_secret:
+ token_creation_email_filter:
<% end %>
View
53 jobs/uaa/templates/uaa.yml.erb
@@ -12,12 +12,9 @@ database:
password: <%= properties.uaa.db.password %>
jvm_args: -Xmx512m
-spring_profiles: jdbc,postgresql,!legacy
+spring_profiles: postgresql
cloud_controller:
- login_url: http://api.<%= properties.domain %>/users/{username}/tokens
- client:
- secret: <%= properties.uaa.cc.client_secret %>
database:
url: jdbc:postgresql://<%= properties.ccdb.address %>:<%= properties.ccdb.port %>/<%= properties.ccdb.dbname %>
username: <%= properties.ccdb.user %>
@@ -26,16 +23,6 @@ cloud_controller:
logging:
config: /var/vcap/jobs/uaa/config/log4j.properties
-<% if properties.uaa.bootstrap %>
-bootstrap:
- admin:
- username: <%= properties.uaa.bootstrap.username %>
- password: <%= properties.uaa.bootstrap.password %>
- given_name: <%= properties.uaa.bootstrap.given_name %>
- family_name: <%= properties.uaa.bootstrap.family_name %>
- email: <%= properties.uaa.bootstrap.email %>
-<% end %>
-
varz:
username: _random_username_replaced_by_a_script_
password: _random_password_replaced_by_a_script_
@@ -53,18 +40,26 @@ batch:
password: <%= properties.uaa.batch.password %>
<% end %>
-app:
- client:
- secret: $2a$08$JKFkUDiMfnCKKnbwE9yxAuBJB8oV5RUPzt553MwPvEtefpxpq0SZO
-
-my:
- client:
- secret: $2a$08$HrbalH0yg24el9D1waAkNOAJZbakcTgNilwVUqlCobLJV4rh3At2W
-
-scim:
- client:
- secret: $2a$08$iuYnIr4UmTbWJU5ciubvDe7NIrW0Fv6v7vAqgHVPY5Mpq7bEyx9gG
-
-token:
- client:
- secret: $2a$08$1l4gKzW9LlEWHjwSgK4WAeJHveTCtPmR3N9wUcUBzk8jNgezhiaiW
+oauth:
+ clients:
+ admin:
+ authorized-grant-types: client_credentials
+ scope: read,write,password
+ authorities: ROLE_CLIENT,ROLE_ADMIN
+ id: admin
+ secret: <%= properties.uaa.admin.client_secret %>
+ resource-ids: clients
+ cloud_controller:
+ authorized-grant-types: client_credentials
+ scope: read,write,password
+ authorities: ROLE_CLIENT,ROLE_ADMIN
+ id: cloud_controller
+ secret: <%= properties.uaa.cc.client_secret %>
+ resource-ids: scim,password,tokens
+ vmc:
+ authorized-grant-types: implicit
+ scope: read,password
+ authorities: ROLE_UNTRUSTED
+ id: vmc
+ resource-ids: cloud_controller,password
+ redirect-uri: http://uaa.cloudfoundry.com/redirect/vmc
2  src/core
@@ -1 +1 @@
-Subproject commit f3a7ca956a9098aef3690dc3e3d6a6a9f7e645eb
+Subproject commit 2d9be87a6d22c5305c5ff0b08c81ffc86bfd1dd3
Please sign in to comment.
Something went wrong with that request. Please try again.