[Devops] Updated configurations

- Copied latest configurations
- Split them to their respective configuration file per profile

authentication-dev.yml

@@ -1,55 +0,0 @@
-spring:
-  datasource:
-    platform : postgres
-    url: jdbc:postgresql://localhost:5432/crss_reg
-    username: crss_reg
-    password: crss_reg
-    driverClassName: org.postgresql.Driver
-  jpa:
-    database: POSTGRESQL
-    show-sql: true
-    hibernate:
-      ddl-auto: update
-  mail:
-    host: smtp.gmail.com
-    port: 587
-    username: demo.exist.pemc@gmail.com
-    # please provide the password
-    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
-
-multipart:
-  maxFileSize: "25Mb"
-  maxRequestSize: "25Mb"
-storage:
-  file:
-    rootFolder: registration-dir
-
-security:
-  oauth2:
-    client:
-      clientId: crss
-      clientSecret: crsssecret
-      authorized-grant-types: authorization_code,refresh_token,password
-      scope: openid
-      access-token-validity-seconds: 3600
-
-server:
-  server:
-    port: 8090
-  undertow:
-    accesslog:
-      dir: target/logs
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1

authentication.yml

@@ -1,51 +0,0 @@
-spring:
-  datasource:
-    platform : oracle
-    url: jdbc:oracle:thin:@//192.168.241.62:1521/ORCL
-    username: crss_reg
-    password: crss_reg
-    driverClassName: oracle.jdbc.OracleDriver
-  jpa:
-    database: ORACLE
-    show-sql: true
-  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.smtp.starttlls.enable: true
-        mail.smtp.starttls.required: true
-  #we dont need spring mvc here
-  freemarker:
-    enabled: false
-    template-loader-path: classpath:/mail/templates
-
-
-multipart:
-  maxFileSize: "25Mb"
-  maxRequestSize: "25Mb"
-storage:
-  file:
-    rootFolder: registration-dir
-
-security:
-  oauth2:
-    client:
-      clientId: crss
-      clientSecret: crsssecret
-      authorized-grant-types: authorization_code,refresh_token,password
-      scope: openid
-      access-token-validity-seconds: 3600
-
-server:
-  undertow:
-    accesslog:
-      dir: target/logs
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1

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-discovery-staging.yml

@@ -0,0 +1,2 @@
+graylog:
+  host: pemc.integration.exist.com

crss-discovery.yml

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,18 @@
+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

metering-dev.yml → crss-reg-dev.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    platform : postgres
+    platform: postgres
     url: jdbc:postgresql://localhost:5432/crss_reg
     username: crss_reg
     password: crss_reg
@@ -9,7 +9,7 @@ spring:
     database: POSTGRESQL
     show-sql: true
     hibernate:
-      ddl-auto: update
+      ddl-auto: none
     properties:
       jadira.usertype.autoRegisterUserTypes: true
       javax.persistence.schema-generation.database.action: none
@@ -32,30 +32,8 @@ spring:
   freemarker:
     enabled: false
     template-loader-path: classpath:/mail/templates
-
-security:
-  oauth2:
-    resource:
-      userInfoUri: http://localhost:8090/user
-
 server:
   port: 8081
-  undertow:
-    accesslog:
-      dir: target/logs
-      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
 
-storage:
-  file:
-    rootFolder: registration-dir
+graylog:
+  host: localhost

crss-reg-devoracle.yml

@@ -0,0 +1,16 @@
+spring:
+  profiles: devoracle
+  datasource:
+    platform: oracle
+    url: jdbc:oracle:thin:@localhost:1521/xe
+    username: pemccrss
+    password: secretpassword
+    driverClassName: oracle.jdbc.OracleDriver
+  jpa:
+    database: ORACLE
+    show-sql: true
+    hibernate:
+      ddl-auto: update
+
+graylog:
+  host: pemc.integration.exist.com

crss-reg-staging.yml

@@ -0,0 +1,36 @@
+spring:
+  profiles: staging
+  datasource:
+    platform: oracle
+    url: jdbc:oracle:thin:@192.168.241.62:1521:ORCL
+    username: crss_reg
+    password: crss_reg
+    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

@@ -0,0 +1,42 @@
+spring:
+  jpa:
+    properties:
+      jadira.usertype.autoRegisterUserTypes: true
+  http:
+    multipart:
+      maxFileSize: "25Mb"
+      maxRequestSize: "25Mb"
+app:
+  docmgt:
+    root-folder: /tmp
+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
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://localhost:8761/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

crss-ui.yml

@@ -64,12 +64,6 @@ zuul:
       stripPrefix: false
       serviceId: crss-reg
 
-
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
-
 hystrix:
   command:
     default:

metering.yml

@@ -1,64 +0,0 @@
-spring:
-  datasource:
-    platform : oracle
-    url: jdbc:oracle:thin:@192.168.241.62:1521:ORCL
-    username: crss_reg
-    password: crss_reg
-    driverClassName: oracle.jdbc.OracleDriver
-    tomcat:
-      # Number of ms to wait before throwing an exception if no connection is available.
-      max-wait: 10000
-      # Maximum number of active connections that can be allocated from this pool at the same time.
-      max-active: 50
-      # Validate the connection before borrowing it from the pool.
-      test-on-borrow: true
-  jpa:
-    database: ORACLE
-    show-sql: true
-    properties:
-      jadira.usertype.autoRegisterUserTypes: 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.smtp.starttlls.enable: true
-        mail.smtp.starttls.required: true
-  #we dont need spring mvc here
-  freemarker:
-    enabled: false
-    template-loader-path: classpath:/mail/templates
-
-security:
-  oauth2:
-    resource:
-      userInfoUri: http://localhost:8090/user
-
-server:
-  undertow:
-    accesslog:
-      dir: target/logs
-      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
-
-storage:
-  file:
-    rootFolder: registration-dir

registration-dev.yml

@@ -1,61 +0,0 @@
-spring:
-  datasource:
-    platform : postgres
-    url: jdbc:postgresql://localhost:5432/crss_reg
-    username: crss_reg
-    password: crss_reg
-    driverClassName: org.postgresql.Driver
-  jpa:
-    database: POSTGRESQL
-    show-sql: true
-    hibernate:
-      ddl-auto: update
-    properties:
-      jadira.usertype.autoRegisterUserTypes: true
-      javax.persistence.schema-generation.database.action: none
-      javax.persistence.schema-generation.create-source: metadata
-      javax.persistence.schema-generation.scripts.action: drop-and-create
-      javax.persistence.schema-generation.scripts.create-target: create.sql
-      javax.persistence.schema-generation.scripts.drop-target: drop.sql
-  mail:
-    host: smtp.gmail.com
-    port: 587
-    username: demo.exist.pemc@gmail.com
-    # please provide the password
-    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
-
-security:
-  oauth2:
-    resource:
-      userInfoUri: http://localhost:8090/user
-
-server:
-  port: 8081
-  undertow:
-    accesslog:
-      dir: target/logs
-      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
-
-storage:
-  file:
-    rootFolder: registration-dir

registration.yml

@@ -1,64 +0,0 @@
-spring:
-  datasource:
-    platform : oracle
-    url: jdbc:oracle:thin:@192.168.241.62:1521:ORCL
-    username: crss_reg
-    password: crss_reg
-    driverClassName: oracle.jdbc.OracleDriver
-    tomcat:
-      # Number of ms to wait before throwing an exception if no connection is available.
-      max-wait: 10000
-      # Maximum number of active connections that can be allocated from this pool at the same time.
-      max-active: 50
-      # Validate the connection before borrowing it from the pool.
-      test-on-borrow: true
-  jpa:
-    database: ORACLE
-    show-sql: true
-    properties:
-      jadira.usertype.autoRegisterUserTypes: 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.smtp.starttlls.enable: true
-        mail.smtp.starttls.required: true
-  #we dont need spring mvc here
-  freemarker:
-    enabled: false
-    template-loader-path: classpath:/mail/templates
-
-security:
-  oauth2:
-    resource:
-      userInfoUri: http://localhost:8090/user
-
-server:
-  undertow:
-    accesslog:
-      dir: target/logs
-      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
-
-storage:
-  file:
-    rootFolder: registration-dir