Permalink
Browse files

CFID-251: change config path

Change-Id: Iebb3985ef7d7abdbc36e2be36e5c4fca5a8e6c58
  • Loading branch information...
1 parent bca1626 commit e2e261b6b13d221b7f6f8584e5014cc2a91b0514 @dsyer dsyer committed Apr 16, 2012
Showing with 3 additions and 5 deletions.
  1. +2 −4 uaa/src/main/resources/uaa.yml
  2. +1 −1 uaa/src/main/webapp/WEB-INF/spring-servlet.xml
@@ -26,12 +26,10 @@ cloud_controller:
batch:
username: batch_user
password: batch_password
-
-endpoints:
- authorize:
- ssl: # set this to "true" to force https to be used by the user approval page
oauth:
+ authorize:
+ ssl: # set this to "true" to force https to be used by the user approval page
clients:
admin:
authorized-grant-types: client_credentials
@@ -239,7 +239,7 @@
<bean id="accessController" class="org.cloudfoundry.identity.uaa.oauth.AccessController">
<property name="clientDetailsService" ref="clientDetails" />
<!-- Always use HTTPS if deployed on cloudfoundry -->
- <property name="useSsl" value="#{applicationProperties['endpoints.authorize.ssl']?:(T(java.lang.System).getenv('VCAP_APPLICATION')!=null ? true : null)}"/>
+ <property name="useSsl" value="#{applicationProperties['oauth.authorize.ssl']?:(T(java.lang.System).getenv('VCAP_APPLICATION')!=null ? true : null)}"/>
</bean>
<bean id="homeController" class="org.cloudfoundry.identity.uaa.home.HomeController" />

0 comments on commit e2e261b

Please sign in to comment.