Move metering's oauth config to global yml

application.yml

@@ -1,3 +1,32 @@
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: ${security.server.url:http://localhost:8082}/oauth/access_token
+      userAuthorizationUri: ${security.server.url:http://localhost:8082}/oauth/authorize
+      clientId: crss
+      clientSecret: crsssecret
+      authorized-grant-types: authorization_code,refresh_token,password
+      scope: openid
+      access-token-validity-seconds: 3600
+    resource:
+      userInfoUri: ${security.server.url:http://localhost:8082}/user
+
 logging:
   pattern:
     level: 'username:%X{username:-system} %5p'
+
+---
+spring:
+  profiles: docker
+security.server.url: http://app:8080
+
+---
+spring:
+  profiles: staging
+  profiles.include: docker
+
+---
+spring:
+  profiles: uat
+  profiles.include: docker

crss-metering/application-dev.yml

@@ -22,19 +22,6 @@ eureka:
     serviceUrl:
       defaultZone: http://localhost:8761/eureka/
 
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://localhost:8082/oauth/access_token
-      userAuthorizationUri: http://localhost:8082/oauth/authorize
-      clientId: crss
-      clientSecret: crsssecret
-      authorized-grant-types: authorization_code,refresh_token,password
-      scope: openid
-      access-token-validity-seconds: 3600
-    resource:
-      userInfoUri: http://localhost:8082/user
-
 logging:
   level:
     com.pemc: DEBUG

crss-metering/application-staging.yml

@@ -16,19 +16,6 @@ spring:
   rabbitmq:
     host: 192.168.241.62
 
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://app:8080/admin/oauth/access_token
-      userAuthorizationUri: http://app:8080/admin/oauth/authorize
-      clientId: crss
-      clientSecret: crsssecret
-      authorized-grant-types: authorization_code,refresh_token,password
-      scope: openid
-      access-token-validity-seconds: 3600
-    resource:
-      userInfoUri: http://app:8080/admin/user
-
 # currently staging and uat shared in one graylog which is not good
 #graylog:
 #  host: pemc.integration.exist.com

crss-metering/application-uat.yml

@@ -16,18 +16,5 @@ spring:
   rabbitmq:
     host: pemc-oracle.ss.exist.com
 
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://app:8080/admin/oauth/access_token
-      userAuthorizationUri: http://app:8080/admin/oauth/authorize
-      clientId: crss
-      clientSecret: crsssecret
-      authorized-grant-types: authorization_code,refresh_token,password
-      scope: openid
-      access-token-validity-seconds: 3600
-    resource:
-      userInfoUri: http://app:8080/admin/user
-
 graylog:
   host: pemc.integration.exist.com

crss-reg/crss-reg.yml

@@ -17,18 +17,7 @@ spring:
 app:
   docmgt:
     root-folder: /crss/docmgt
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://app:8080/admin/oauth/access_token
-      userAuthorizationUri: http://app:8080/admin/oauth/authorize
-      clientId: crss
-      clientSecret: crsssecret
-      authorized-grant-types: authorization_code,refresh_token,password
-      scope: openid
-      access-token-validity-seconds: 3600
-    resource:
-      userInfoUri: http://app:8080/admin/user
+
 eureka:
   client:
     serviceUrl: