Organize admin service config

application.yml

@@ -1,3 +1,11 @@
+spring:
+  jpa:
+    properties:
+      hibernate.integration.envers.enabled: true
+      jadira.usertype.autoRegisterUserTypes: true
+    show-sql: false
+    hibernate:
+      ddl-auto: none
 
 security:
   oauth2:
@@ -26,6 +34,7 @@ server:
   compression:
     enabled: true
     min-response-size: 1
+
 logging:
   pattern:
     level: 'username:%X{username:-system} %5p'
@@ -35,6 +44,15 @@ logging:
     org.springframework.cloud: WARN
 
 ---
+spring:
+  profiles: dev
+  jpa.properties:
+    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: target/create.sql
+    javax.persistence.schema-generation.scripts.drop-target: target/drop.sql
+---
 spring:
   profiles: docker
 security.server.url: http://app:8080

crss-admin/crss-admin-dev-docker.yml

@@ -1,36 +0,0 @@
-spring:
-  datasource:
-    platform : postgres
-    url: jdbc:postgresql://db:5432/crss_admin
-    username: crss_admin
-    password: crss_admin
-    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: target/create.sql
-      javax.persistence.schema-generation.scripts.drop-target: target/drop.sql
-
-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-admin/crss-admin-dev.yml

@@ -22,23 +22,6 @@ spring:
 server:
   port: 8082
 
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://localhost:8082/oauth/access_token
-      userAuthorizationUri: http://localhost:8080/oauth/authorize
-    resource:
-      userInfoUri: http://localhost:8082/user
-
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
-
-graylog:
-  host: localhost
-
 crss:
   ldap:
     embedded: true

crss-admin/crss-admin-devoracle.yml

@@ -1,49 +0,0 @@
-spring:
-  datasource:
-    platform: oracle
-    url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-    username: crss_admin
-    password: crss_admin
-    driverClassName: oracle.jdbc.OracleDriver
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 20
-  rabbitmq:
-    username: guest
-    password: guest
-    host: localhost
-    ports:
-      - "5672:5672"
-      - "15672:15672"
-
-server:
-  port: 8082
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://localhost:8082/oauth/access_token
-      userAuthorizationUri: http://localhost:8082/oauth/authorize
-    resource:
-      userInfoUri: http://localhost:8082/user
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
-
-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-admin/crss-admin-no-ldap.yml

@@ -1,14 +0,0 @@
-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"
-    passwordOpEnabled: false

crss-admin/crss-admin-prod.yml

@@ -1,14 +0,0 @@
-#sample values. do not use yet
-spring:
-  profiles: prod
-  datasource:
-    platform: oracle
-    url: jdbc:oracle:thin:@//[HOST][:PORT]/SERVICE
-    username: foo
-    password: bar
-    driverClassName: oracle.jdbc.OracleDriver
-  jpa:
-    database: ORACLE
-
-graylog:
-  host: TODO

crss-admin/crss-admin-staging.yml

@@ -1,18 +1,16 @@
 spring:
+  profiles.include: ldap
+  jpa:
+    database: ORACLE
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.Oracle10gDialect
   datasource:
     platform: oracle
-    url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
+    url: jdbc:oracle:thin:@192.168.241.62:1521:ORCL
     username: crss_admin
     password: crss_admin
     driverClassName: oracle.jdbc.OracleDriver
     hikari:
       connectionTimeout: 10000
-      maximumPoolSize: 20
-  rabbitmq:
-      host: pemc-oracle.ss.exist.com
-      ports:
-        - "5672:5672"
-        - "15672:15672"
-
-graylog:
-  host: pemc.integration.exist.com
+      maximumPoolSize: 20

crss-admin/crss-admin-uat.yml

@@ -1,15 +1,16 @@
 spring:
+  profiles.include: ldap
+  jpa:
+    database: ORACLE
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.Oracle10gDialect
   datasource:
     platform: oracle
     url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-    username: crss_admin_uat
-    password: crss_admin_uat
+    username: crss_admin
+    password: crss_admin
     driverClassName: oracle.jdbc.OracleDriver
     hikari:
       connectionTimeout: 10000
-      maximumPoolSize: 20
-  jpa:
-    database: ORACLE
-
-graylog:
-  host: pemc.integration.exist.com
+      maximumPoolSize: 20

crss-admin/crss-admin.yml

@@ -1,11 +1,4 @@
 spring:
-  jpa:
-    database: ORACLE
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        integration.envers.enabled: true
-      jadira.usertype.autoRegisterUserTypes: true
   http:
     multipart:
       maxFileSize: "25Mb"
@@ -13,58 +6,7 @@ spring:
   resources:
     chain:
       gzipped: true
-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:
-      defaultZone: http://discovery:8080/eureka/
-      #    healthcheck:
-      #      enabled: true
 
 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
-    host: "192.168.241.67"
-    port: 636
-    root-dn: "dc=wesmsys,dc=local"
-    user-search-base: ""
-    admin-user: "wesmsys\\crssadmin"
-    admin-password: "1qaz@WSX"
-    username-field: "userPrincipalName"
-    domain: "wesmsys.local"
-    embedded: false
-    passwordOpEnabled: true
+    enabled: false