[Devops] updated config files.- removed default server.port

crss-admin-dev.yml

@@ -22,16 +22,16 @@ server:
 
 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-uat.yml

@@ -0,0 +1,16 @@
+spring:
+  datasource:
+    platform: oracle
+    url: jdbc:oracle:thin:@192.168.241.62:1521:ORCL
+    username: crss_admin_uat
+    password: crss_admin_uat
+    driverClassName: oracle.jdbc.OracleDriver
+    hikari:
+      connectionTimeout: 10000
+      maximumPoolSize: 20
+  jpa:
+    database: ORACLE
+    show-sql: true
+
+graylog:
+  host: pemc.integration.exist.com

crss-admin.yml

@@ -35,6 +35,24 @@ feign:
   hystrix:
     enabled: false
 
+server:
+  undertow:
+    accesslog:
+      dir: target
+      enabled: true
+      pattern: combined
+  compression:
+    enabled: true
+    min-response-size: 1
+  jackson:
+   # for further customization please consult the documentation:
+   # http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#howto-customize-the-jackson-objectmapper
+   # https://github.com/FasterXML/jackson-databind/wiki
+   # deserialization:
+   #   FAIL_ON_UNKNOWN_PROPERTIES: true
+   #   DEFAULT_VIEW_INCLUSION: true
+
+
 crss:
   ldap:
     protocol: "ldaps"

crss-discovery.yml

@@ -1,25 +0,0 @@
-server:
-  port: 8761
-
-eureka:
-  instance:
-    hostname: localhost
-  client:
-    registerWithEureka: false
-    fetchRegistry: false
-    serviceUrl:
-      # NOTE: defaultZone is currently pointing to self.
-      #       Sufficient for development purposes but should
-      #       be changed when used in a cluster environment
-      defaultZone: http://localhost:8761/eureka/
-  server:
-    enableSelfPreservation: false
-    waitTimeInMsWhenSyncEmpty: 0
-
-
-graylog.host: localhost
-
-logging:
-  level:
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG

crss-reg-common.yml

@@ -1,18 +0,0 @@
-server:
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-  jackson:
-   # for further customization please consult the documentation:
-   # http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#howto-customize-the-jackson-objectmapper
-   # https://github.com/FasterXML/jackson-databind/wiki
-   # deserialization:
-   #   FAIL_ON_UNKNOWN_PROPERTIES: true
-   #   DEFAULT_VIEW_INCLUSION: true
-   serialization:
-     write_dates_as_timestamps: false

crss-reg-prod.yml

@@ -0,0 +1,14 @@
+spring:
+  profiles: prod
+  datasource:
+    platform: oracle
+    url: jdbc:oracle:thin:@//[HOST][:PORT]/SERVICE
+    username: foo
+    password: bar
+    driverClassName: oracle.jdbc.OracleDriver
+  jpa:
+    database: ORACLE
+    show-sql: true
+
+graylog:
+  host: TODO

crss-reg-uat.yml

@@ -0,0 +1,36 @@
+spring:
+  profiles: staging
+  datasource:
+    platform: oracle
+    url: jdbc:oracle:thin:@192.168.241.62:1521:ORCL
+    username: crss_reg_uat
+    password: crss_reg_uat
+    driverClassName: oracle.jdbc.OracleDriver
+    hikari:
+      connectionTimeout: 10000
+      maximumPoolSize: 20
+  jpa:
+    database: ORACLE
+    show-sql: true
+  http:
+    multipart:
+      maxFileSize: "25Mb"
+      maxRequestSize: "25Mb"
+  mail:
+      host: smtp.gmail.com
+      port: 587
+      # TODO: replace this values
+      username: demo.exist.pemc@gmail.com
+      password: $pockTest
+      properties:
+        mail.smtp.auth: true
+        mail.debug: true
+        mail.smtp.starttlls.enable: true
+        mail.smtp.starttls.required: true
+  #we dont need spring mvc here
+  freemarker:
+    enabled: false
+    template-loader-path: classpath:/mail/templates
+
+graylog:
+  host: pemc.integration.exist.com

crss-reg.yml

@@ -40,3 +40,22 @@ logging:
     com.netflix: INFO
     org.springframework.cloud: DEBUG
     org.springframework.security: DEBUG
+
+server:
+  undertow:
+    accesslog:
+      dir: target
+      enabled: true
+      pattern: combined
+  compression:
+    enabled: true
+    min-response-size: 1
+  jackson:
+   # for further customization please consult the documentation:
+   # http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#howto-customize-the-jackson-objectmapper
+   # https://github.com/FasterXML/jackson-databind/wiki
+   # deserialization:
+   #   FAIL_ON_UNKNOWN_PROPERTIES: true
+   #   DEFAULT_VIEW_INCLUSION: true
+   serialization:
+     write_dates_as_timestamps: false

crss-ui-staging.yml

@@ -1,4 +1,5 @@
 spring:
   profiles: staging
 
-graylog.host: pemc.integration.exist.com
+graylog:
+  host: pemc.integration.exist.com

crss-ui.yml

@@ -39,6 +39,11 @@ zuul:
       stripPrefix: false
       serviceId: crss-reg
 
+    facilities:
+        path: /facilities/**
+        stripPrefix: false
+        serviceId: crss-reg
+
     admin:
       path: /admin/**
       stripPrefix: false