From a243427b4bb15f0aeed3fbca3e7e824fd622c24a Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Tue, 14 May 2024 14:57:20 +0300 Subject: [PATCH] config changes --- .../main/resources/config/dashboard-devel.yml | 4 +++ .../src/main/resources/config/dashboard.yml | 4 +-- backend/web/src/main/resources/config/db.yml | 12 ++----- .../main/resources/config/elasticsearch.yml | 16 ++++----- .../src/main/resources/config/external.yml | 4 --- .../main/resources/config/logging-devel.yml | 36 +------------------ .../resources/config/notification-devel.yml | 14 ++++++++ .../main/resources/config/notification.yml | 13 ------- .../resources/config/public-api-devel.yml | 10 ++++++ .../src/main/resources/config/public-api.yml | 10 +----- .../src/main/resources/config/security.yml | 4 +-- 11 files changed, 44 insertions(+), 83 deletions(-) create mode 100644 backend/web/src/main/resources/config/dashboard-devel.yml create mode 100644 backend/web/src/main/resources/config/notification-devel.yml create mode 100644 backend/web/src/main/resources/config/public-api-devel.yml diff --git a/backend/web/src/main/resources/config/dashboard-devel.yml b/backend/web/src/main/resources/config/dashboard-devel.yml new file mode 100644 index 000000000..ed280bb46 --- /dev/null +++ b/backend/web/src/main/resources/config/dashboard-devel.yml @@ -0,0 +1,4 @@ +dashboard: + reference-type-counters: + - "7eeffb98-58fb-4921-82ec-e27f32f8e738" + - "5b9c284f-f041-4995-96cc-fad7ad13289c" \ No newline at end of file diff --git a/backend/web/src/main/resources/config/dashboard.yml b/backend/web/src/main/resources/config/dashboard.yml index ed280bb46..8119375cb 100644 --- a/backend/web/src/main/resources/config/dashboard.yml +++ b/backend/web/src/main/resources/config/dashboard.yml @@ -1,4 +1,2 @@ dashboard: - reference-type-counters: - - "7eeffb98-58fb-4921-82ec-e27f32f8e738" - - "5b9c284f-f041-4995-96cc-fad7ad13289c" \ No newline at end of file + reference-type-counters: [] \ No newline at end of file diff --git a/backend/web/src/main/resources/config/db.yml b/backend/web/src/main/resources/config/db.yml index 917ce54bf..d77085af8 100644 --- a/backend/web/src/main/resources/config/db.yml +++ b/backend/web/src/main/resources/config/db.yml @@ -1,9 +1,3 @@ -#database: -# driver-class-name: org.postgresql.Driver -# lock-fail-interval: 120000 -# url: ${DB_URL:} -# username: ${DB_USER:} -# password: ${DB_PASS:} spring: jpa: properties: @@ -19,9 +13,9 @@ spring: physical-strategy: org.opencdmp.data.namingstrategy.PrefixPhysicalNamingStrategy implicit-strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy datasource: - url: ${DB_URL:} - username: ${DB_USER:} - password: ${DB_PASS:} + url: ${DB_URL} + username: ${DB_USER} + password: ${DB_PASS} driver-class-name: org.postgresql.Driver hikari: connection-timeout: 30000 diff --git a/backend/web/src/main/resources/config/elasticsearch.yml b/backend/web/src/main/resources/config/elasticsearch.yml index 47c9499a6..6a3f171b6 100644 --- a/backend/web/src/main/resources/config/elasticsearch.yml +++ b/backend/web/src/main/resources/config/elasticsearch.yml @@ -1,10 +1,10 @@ elastic: - enabled: ${ELASTIC_ENABLED:} + enabled: ${ELASTIC_ENABLED} hosts: - - ${ELASTIC_HOST:} - username: ${ELASTIC_USER:} - password: ${ELASTIC_PASS:} - useSSL: ${ELASTIC_USE_SSL:} + - ${ELASTIC_HOST} + username: ${ELASTIC_USER} + password: ${ELASTIC_PASS} + useSSL: ${ELASTIC_USE_SSL} socketTimeoutMillis: 30000 connectTimeoutMillis: 30000 defaultResultSize: 100 @@ -14,8 +14,8 @@ elastic: defaultCompositeAggregationResultSize: 200000 disableHostnameVerifier: false app-elastic: - enabled: ${ELASTIC_ENABLED:} - dmpIndexName: ${ELASTIC_DMP_INDEX:} - descriptionIndexName: ${ELASTIC_DESCRIPTION_INDEX:} + enabled: ${ELASTIC_ENABLED} + dmpIndexName: ${ELASTIC_DMP_INDEX} + descriptionIndexName: ${ELASTIC_DESCRIPTION_INDEX} enableIcuAnalysisPlugin: false resetBatchSize: 1000 diff --git a/backend/web/src/main/resources/config/external.yml b/backend/web/src/main/resources/config/external.yml index 8c40185a5..68718a4bb 100644 --- a/backend/web/src/main/resources/config/external.yml +++ b/backend/web/src/main/resources/config/external.yml @@ -1,7 +1,3 @@ -pdf: - converter: - url: ${PDF_CONVERTER_URL:} - publicapi: host: devel.opendmp.eu basePath: /srv diff --git a/backend/web/src/main/resources/config/logging-devel.yml b/backend/web/src/main/resources/config/logging-devel.yml index 59f65e470..1910ce38d 100644 --- a/backend/web/src/main/resources/config/logging-devel.yml +++ b/backend/web/src/main/resources/config/logging-devel.yml @@ -1,36 +1,2 @@ logging: - config: classpath:logging/logback-${spring.profiles.active}.xml - context: - request: - requestIdKey: req.id - requestRemoteHostKey: req.remoteHost - requestUriKey: req.requestURI - requestQueryStringKey: req.queryString - requestUrlKey : req.requestURL - requestMethodKey: req.method - requestUserAgentKey: req.userAgent - requestForwardedForKey: req.xForwardedFor - requestSchemeKey: req.scheme - requestRemoteAddressKey: req.remoteAddr - requestRemotePortKey: req.remotePort - requestRemoteUserKey: req.remoteUser - principal: - subjectKey: usr.subject - nameKey: usr.name - clientKey: usr.client -audit: - enable: true - requestRemoteHostKey: req.remoteHost - requestUriKey: req.requestURI - requestQueryStringKey: req.queryString - requestUrlKey : req.requestURL - requestMethodKey: req.method - requestUserAgentKey: req.userAgent - requestForwardedForKey: req.xForwardedFor - requestSchemeKey: req.scheme - requestRemoteAddressKey: req.remoteAddr - requestRemotePortKey: req.remotePort - requestRemoteUserKey: req.remoteUser - principalSubjectKey: usr.subject - principalNameKey: usr.name - principalClientKey: usr.client + config: classpath:logging/logback-${spring.profiles.active}.xml \ No newline at end of file diff --git a/backend/web/src/main/resources/config/notification-devel.yml b/backend/web/src/main/resources/config/notification-devel.yml new file mode 100644 index 000000000..9fcb3db83 --- /dev/null +++ b/backend/web/src/main/resources/config/notification-devel.yml @@ -0,0 +1,14 @@ +notification: + dmpInvitationExternalUserType: 065DEECD-21BB-44AF-9983-E660FDF24BC4 + dmpInvitationExistingUserType: 4904dea2-5079-46d3-83be-3a19c9ab45dc + dmpModifiedType: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB + dmpFinalisedType: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E + descriptionModifiedType: 4FDBFA80-7A71-4A69-B854-67CBB70648F1 + descriptionFinalisedType: 33790bad-94d4-488a-8ee2-7f6295ca18ea + mergeAccountConfirmationType: BFE68845-CB05-4C5A-A03D-29161A7C9660 + removeCredentialConfirmationType: C9BC3F16-057E-4BBA-8A5F-36BD835E5604 + dmpDepositType: 55736F7A-83AB-4190-AF43-9D031A6F9612 + descriptionTemplateInvitationType: 223BB607-EFA1-4CE7-99EC-4BEABFEF9A8B + contactSupportType: 5B1D6C52-88F9-418B-9B8A-6F1F963D9EAD + publicContactSupportType: B542B606-ACC6-4629-ADEF-4D8EE2F01222 + contactSupportEmail: support@dmp.com \ No newline at end of file diff --git a/backend/web/src/main/resources/config/notification.yml b/backend/web/src/main/resources/config/notification.yml index 2927a1a93..0a3261e83 100644 --- a/backend/web/src/main/resources/config/notification.yml +++ b/backend/web/src/main/resources/config/notification.yml @@ -1,15 +1,2 @@ notification: - dmpInvitationExternalUserType: 065DEECD-21BB-44AF-9983-E660FDF24BC4 - dmpInvitationExistingUserType: 4904dea2-5079-46d3-83be-3a19c9ab45dc - dmpModifiedType: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB - dmpFinalisedType: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E - descriptionModifiedType: 4FDBFA80-7A71-4A69-B854-67CBB70648F1 - descriptionFinalisedType: 33790bad-94d4-488a-8ee2-7f6295ca18ea - mergeAccountConfirmationType: BFE68845-CB05-4C5A-A03D-29161A7C9660 - removeCredentialConfirmationType: C9BC3F16-057E-4BBA-8A5F-36BD835E5604 - dmpDepositType: 55736F7A-83AB-4190-AF43-9D031A6F9612 - descriptionTemplateInvitationType: 223BB607-EFA1-4CE7-99EC-4BEABFEF9A8B - contactSupportType: 5B1D6C52-88F9-418B-9B8A-6F1F963D9EAD - publicContactSupportType: B542B606-ACC6-4629-ADEF-4D8EE2F01222 - contactSupportEmail: support@dmp.com emailExpirationTimeSeconds: 14400 \ No newline at end of file diff --git a/backend/web/src/main/resources/config/public-api-devel.yml b/backend/web/src/main/resources/config/public-api-devel.yml new file mode 100644 index 000000000..de7b59e8f --- /dev/null +++ b/backend/web/src/main/resources/config/public-api-devel.yml @@ -0,0 +1,10 @@ +public-api: + reference-type-map: + funderTypeId: "538928bb-c7c6-452e-b66d-08e539f5f082" + grantTypeId: "5b9c284f-f041-4995-96cc-fad7ad13289c" + registryTypeId: "2beacaad-3223-43ad-ad99-1e5f21328e7b" + serviceTypeId: "9ec2000d-95c7-452e-b356-755fc8e2574c" + dataRepositoryTypeId: "d26b64ba-fda0-4b14-b3ef-9856a492d55a" + datasetTypeId: "a3ce0fb2-d72c-48bb-b322-7401940cb802" + researcherTypeId: "5a2112e7-ea99-4cfe-98a1-68665e26726e" + organizationTypeId: "7eeffb98-58fb-4921-82ec-e27f32f8e738" \ No newline at end of file diff --git a/backend/web/src/main/resources/config/public-api.yml b/backend/web/src/main/resources/config/public-api.yml index de7b59e8f..f569ce7e3 100644 --- a/backend/web/src/main/resources/config/public-api.yml +++ b/backend/web/src/main/resources/config/public-api.yml @@ -1,10 +1,2 @@ public-api: - reference-type-map: - funderTypeId: "538928bb-c7c6-452e-b66d-08e539f5f082" - grantTypeId: "5b9c284f-f041-4995-96cc-fad7ad13289c" - registryTypeId: "2beacaad-3223-43ad-ad99-1e5f21328e7b" - serviceTypeId: "9ec2000d-95c7-452e-b356-755fc8e2574c" - dataRepositoryTypeId: "d26b64ba-fda0-4b14-b3ef-9856a492d55a" - datasetTypeId: "a3ce0fb2-d72c-48bb-b322-7401940cb802" - researcherTypeId: "5a2112e7-ea99-4cfe-98a1-68665e26726e" - organizationTypeId: "7eeffb98-58fb-4921-82ec-e27f32f8e738" \ No newline at end of file + reference-type-map: [] \ No newline at end of file diff --git a/backend/web/src/main/resources/config/security.yml b/backend/web/src/main/resources/config/security.yml index 5776031be..edbfa69b5 100644 --- a/backend/web/src/main/resources/config/security.yml +++ b/backend/web/src/main/resources/config/security.yml @@ -10,6 +10,6 @@ web: token-type: JWT #| opaque jwt: claims: [ role, x-role ] - issuer-uri: ${IDP_ISSUER_URI:} + issuer-uri: ${IDP_ISSUER_URI} audiences: [ "dmp_web" ] - validIssuer: ${IDP_ISSUER_URI:} \ No newline at end of file + validIssuer: ${IDP_ISSUER_URI} \ No newline at end of file