diff --git a/backend/pom.xml b/backend/pom.xml index f97fc3720e..4663554620 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -6,11 +6,11 @@ ch.puzzle.okr parent - 2.0.206-SNAPSHOT + 3.0.3-SNAPSHOT backend - 2.0.206-SNAPSHOT + 3.0.3-SNAPSHOT backend Puzzle OKR Tool diff --git a/backend/src/main/resources/application-prod.properties b/backend/src/main/resources/application-prod.properties index 9461ba2585..913354d0ad 100644 --- a/backend/src/main/resources/application-prod.properties +++ b/backend/src/main/resources/application-prod.properties @@ -1,4 +1,38 @@ -# logging level for production +# logging level for staging +logging.level.ch.puzzle.okr=warn logging.level.org.springframework=warn +logging.level.org.flywaydb.core=warn +connect.src=https://sso.puzzle.ch + + +hibernate.connection.url=jdbc:postgresql://localhost:5432/okr +hibernate.connection.username=user +hibernate.connection.password=pwd +hibernate.multiTenancy=SCHEMA + + +# TENANT Configuration +okr.tenant-ids=pitc +okr.datasource.driver-class-name=org.postgresql.Driver + +# pitc +okr.tenants.pitc.datasource.url=jdbc:postgresql://localhost:5432/okr +okr.tenants.pitc.datasource.username=user +okr.tenants.pitc.datasource.password=pwd +okr.tenants.pitc.datasource.schema=okr_pitc +okr.tenants.pitc.user.champion.emails=gl@gl.com +okr.tenants.pitc.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:8544/realms/pitc/protocol/openid-connect/certs +okr.tenants.pitc.security.oauth2.frontend.issuer-url=http://localhost:8544/realms/pitc +okr.tenants.pitc.security.oauth2.frontend.client-id=pitc_okr_prod + + +# pit client customization +okr.tenants.pitc.clientcustomization.logo=assets/images/okr-logo.svg +okr.tenants.pitc.clientcustomization.triangles=assets/images/triangles-okr-header.svg +okr.tenants.pitc.clientcustomization.background-logo=assets/images/puzzle-p.svg +okr.tenants.pitc.clientcustomization.favicon=assets/favicon.png +okr.tenants.pitc.clientcustomization.title=Puzzle OKR +okr.tenants.pitc.clientcustomization.customstyles.okr-topbar-background-color=#1e5a96 +okr.tenants.pitc.clientcustomization.customstyles.okr-banner-background-color=#dcedf9 diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 03faf88d85..70b1ff8014 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -12,6 +12,8 @@ spring.flyway.baseline-on-migrate=true # debug options logging.level.ch.puzzle.okr=INFO logging.level.org.springframework.security=INFO +logging.level.org.flywaydb.core=INFO + # cache configuration caching.authorization.users.TTL=1800000 diff --git a/pom.xml b/pom.xml index 9272512469..70d1aff896 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ ch.puzzle.okr parent - 2.0.206-SNAPSHOT + 3.0.3-SNAPSHOT org.springframework.boot