Browse Source

Remove duplicates setting of sec server url

Monte Cillo Co 8 years ago
parent
commit
60c61ae0ec
4 changed files with 5 additions and 7 deletions
  1. 0 1
      application-pemc-uat.yml
  2. 0 1
      application-ss-combined.yml
  3. 0 1
      application-staging.yml
  4. 5 4
      application.yml

+ 0 - 1
application-pemc-uat.yml

@@ -1 +0,0 @@
-security.server.url: http://crssapplication-main-ui.marathon.l4lb.thisdcos.directory:8080/admin

+ 0 - 1
application-ss-combined.yml

@@ -1 +0,0 @@
-security.server.url: http://crssapplication-main-ui.marathon.l4lb.thisdcos.directory:8080/admin

+ 0 - 1
application-staging.yml

@@ -5,6 +5,5 @@ spring:
     host: redis
 graylog:
   host: 192.168.241.62
-security.server.url: http://app:8080/admin
 crss:
   api.gateway: http://app:8080

+ 5 - 4
application.yml

@@ -24,8 +24,8 @@ spring:
 security:
   oauth2:
     client:
-      accessTokenUri: ${security.server.url:http://localhost:8082}/oauth/access_token
-      userAuthorizationUri: ${security.server.url:http://localhost:8082}/oauth/authorize
+      accessTokenUri: ${crss.security.url}/oauth/access_token
+      userAuthorizationUri: ${crss.security.url}/oauth/authorize
       clientId: crss
       clientSecret: crsssecret
       authorized-grant-types: authorization_code,refresh_token,password
@@ -33,7 +33,7 @@ security:
       access-token-validity-seconds: 3600
     resource:
       filter-order: 3
-      userInfoUri: ${security.server.url:http://localhost:8082}/user
+      userInfoUri: ${crss.security.url}/user
 
 server:
   undertow:
@@ -57,4 +57,5 @@ graylog:
   host: logginggraylog.marathon.l4lb.thisdcos.directory
 
 crss:
-  api.gateway: http://crssapplication-main-ui.marathon.l4lb.thisdcos.directory:8080
+  api.gateway: http://crssapplication-main-ui.marathon.l4lb.thisdcos.directory:8080
+  security.url: ${crss.api.gateway}/admin