devops / master - synchronized config with app repo

crss-admin-dev-docker.yml

@@ -21,16 +21,16 @@ spring:
 graylog:
   host: localhost
 
-# crss:
-#   ldap:
-#     embedded: true
-#     protocol: "ldap"
-#     host: "localhost"
-#     port: 33389
-#     root-dn: "dc=wesmsys,dc=local"
-#     ldif: "classpath:embedded-ldap.ldif"
-#     user-search-base: ""
-#     admin-user: "uid=crssadmin,ou=Administrators,dc=wesmsys,dc=local"
-#     admin-password: "1qaz@WSX"
-#     username-field: "uid"
-#     domain: "wesmsys.local"
+crss:
+  ldap:
+    embedded: true
+    protocol: "ldap"
+    host: "localhost"
+    port: 33389
+    root-dn: "dc=wesmsys,dc=local"
+    ldif: "classpath:embedded-ldap.ldif"
+    user-search-base: ""
+    admin-user: "uid=crssadmin,ou=Administrators,dc=wesmsys,dc=local"
+    admin-password: "1qaz@WSX"
+    username-field: "uid"
+    domain: "wesmsys.local"

crss-admin.yml

@@ -25,11 +25,6 @@ eureka:
       defaultZone: http://discovery:8080/eureka/
       #    healthcheck:
       #      enabled: true
-    lease:
-      duration: 5
-  instance:
-    leaseRenewalIntervalInSeconds: 1
-    leaseExpirationDurationInSeconds: 2
 
 feign:
   hystrix:

crss-reg.yml

@@ -27,19 +27,15 @@ eureka:
       defaultZone: http://discovery:8080/eureka/
 #    healthcheck:
 #      enabled: true
-    lease:
-      duration: 5
-  instance:
-    leaseRenewalIntervalInSeconds: 1
-    leaseExpirationDurationInSeconds: 2
+
 feign:
   hystrix:
     enabled: false
 logging:
   level:
     com.netflix: INFO
-    org.springframework.cloud: DEBUG
-    org.springframework.security: DEBUG
+    org.springframework.cloud: INFO
+    org.springframework.security: INFO
 
 server:
   undertow:

crss-ui.yml

@@ -4,70 +4,15 @@ zuul:
   #removed Authorization from senstiive headers
   sensitiveHeaders: 'Cookie,Set-Cookie'
   routes:
-    applicant:
-      path: /applicant/**
-      stripPrefix: false
-      serviceId: crss-reg
-
-    document:
-      path: /documents/**
-      stripPrefix: false
-      serviceId: crss-reg
-
-    approval:
-      path: /approval/**
-      stripPrefix: false
-      serviceId: crss-reg
-
-    organization:
-      path: /organizations/**
-      stripPrefix: false
-      serviceId: crss-reg
-
-    participant:
-      path: /participants/**
-      stripPrefix: false
-      serviceId: crss-reg
-
-    contact:
-      path: /contacts/**
-      stripPrefix: false
-      serviceId: crss-reg
-
-    mirf:
-      path: /mirf/**
-      stripPrefix: false
-      serviceId: crss-reg
-
-    facilities:
-        path: /facilities/**
-        stripPrefix: false
-        serviceId: crss-reg
-
     admin:
       path: /admin/**
-      stripPrefix: false
-      serviceId: crss-admin
-
-    oauthToken:
-      path: /oauth/**
-      stripPrefix: false
       serviceId: crss-admin
-
-    oauthUser:
-      path: /user
-      stripPrefix: false
-      serviceId: crss-admin
-
-    meterInfo:
-      path: /meter-info/**
-      stripPrefix: false
-      serviceId: crss-reg
-
-    remarks:
-      path: /remarks/**
-      stripPrefix: false
+    reg:
+      path: /reg/**
       serviceId: crss-reg
+    metering:
+      path: /metering/**
+      serviceId: crss-metering
 
 hystrix:
   command: