diff --git a/deployment/.env b/deployment/.env index 2b39be141..9627ce545 100644 --- a/deployment/.env +++ b/deployment/.env @@ -7,9 +7,9 @@ PROXY_TAG=mainline-alpine MAIN_APP_TAG=2.1.8 NOTIFICATION_APP_TAG=2.1.7 ANNOTATION_APP_TAG=2.1.7 -DOCX_APP_TAG=0.0.12 -JSON_APP_TAG=0.0.8 -ZENODO_APP_TAG=2.0.8 +DOCX_APP_TAG=0.0.13 +JSON_APP_TAG=0.0.9 +ZENODO_APP_TAG=2.0.9 POSTGRES_TAG=16-alpine ELK_TAG=8.13.0 KEYCLOAK_TAG=24.0.2 diff --git a/deployment/deploy_opencdmp.sh b/deployment/deploy_opencdmp.sh new file mode 100644 index 000000000..fa9d9bd51 --- /dev/null +++ b/deployment/deploy_opencdmp.sh @@ -0,0 +1,47 @@ +#!/bin/bash +set -e +docker-compose down + +sudo rm -r ./storage/postgres/data +mkdir ./storage/postgres/data + +sudo rm -r ./storage/elasticsearch +mkdir ./storage/elasticsearch + +docker-compose up -d opencdmp.elasticsearch + +function loading_icon() { + local load_interval="${1}" + local loading_message="${2}" + local elapsed=0 + local loading_animation=( '—' "\\" '|' '/' ) + + echo -n "${loading_message} " + + tput civis + trap "tput cnorm" EXIT + while [ "${load_interval}" -ne "${elapsed}" ]; do + for frame in "${loading_animation[@]}" ; do + printf "%s\b" "${frame}" + sleep 0.25 + done + elapsed=$(( elapsed + 1 )) + done + printf " \b\n" +} + +loading_icon 45 "Waiting for Elasticsearch to Startup!" + +docker exec opencdmp.elasticsearch /usr/share/elasticsearch/config/index_init.sh + +docker restart opencdmp.elasticsearch + +docker-compose up -d opencdmp.postgres + +loading_icon 20 "Waiting for PostgreSQL to Initialize!" + +docker-compose up -d opencdmp.keycloak + +loading_icon 60 "Waiting for Keycloak to Startup!" + +docker-compose up -d \ No newline at end of file diff --git a/deployment/docker-compose.override.yml b/deployment/docker-compose.override.yml index 33f2c833d..55b8e3356 100644 --- a/deployment/docker-compose.override.yml +++ b/deployment/docker-compose.override.yml @@ -154,24 +154,24 @@ services: ############################## POSTGRES 16 ################################# - # opencdmp.postgres: - # restart: unless-stopped - # mem_limit: 2048M - # ports: - # # - "127.0.0.1:${POSTGRES_PORT}:5432" # If you want to make it accessible locally only - # - "${POSTGRES_PORT}:5432" - # env_file: - # - ./postgres/postgres.env - # volumes: - # - ./storage/postgres/data:/var/lib/postgresql/data - # - ./postgres/opencdmp_init.sql:/docker-entrypoint-initdb.d/opencdmp_init.sql - # networks: - # - opencdmp-postgres-shared-network - # healthcheck: - # test: ["CMD-SHELL", "sh -c 'pg_isready -U postgres -d opencdmp'"] - # interval: 15s - # timeout: 60s - # retries: 5 + opencdmp.postgres: + restart: unless-stopped + mem_limit: 2048M + ports: + # - "127.0.0.1:${POSTGRES_PORT}:5432" # If you want to make it accessible locally only + - "${POSTGRES_PORT}:5432" + env_file: + - ./postgres/postgres.env + volumes: + - ./storage/postgres/data:/var/lib/postgresql/data + - ./postgres/opencdmp_init.sql:/docker-entrypoint-initdb.d/opencdmp_init.sql + networks: + - opencdmp-postgres-shared-network + healthcheck: + test: ["CMD-SHELL", "sh -c 'pg_isready -U postgres -d opencdmp'"] + interval: 15s + timeout: 60s + retries: 5 ################################# ELASTICSEARCH ################################################# @@ -205,27 +205,27 @@ services: timeout: 10s retries: 5 -############################## KEYCLOAK ############################################### - # opencdmp.keycloak: - # restart: unless-stopped - # command: ["start-dev", "--log=console,file", "--log-file=/tmp/logs/keycloak.log", "--import-realm"] - # cpus: 2 - # mem_limit: 2048M - # env_file: - # - ./keycloak/keycloak.env - # environment: - # - JAVA_OPTS_APPEND="-Djava.net.preferIPv4Stack=true" - # volumes: - # - ./logs/keycloak:/tmp/logs - # - ./keycloak/imports/opencdmp-realm.json:/opt/keycloak/data/import/opencdmp-realm.json - # expose: - # - "8080" - # networks: - # - opencdmp-proxy-network - # - opencdmp-postgres-shared-network - # - opencdmp-keycloak-shared-network +#################################### KEYCLOAK ############################################### + opencdmp.keycloak: + restart: unless-stopped + command: ["start-dev", "--log=console,file", "--log-file=/tmp/logs/keycloak.log", "--import-realm"] + cpus: 2 + mem_limit: 2048M + env_file: + - ./keycloak/keycloak.env + environment: + - JAVA_OPTS_APPEND="-Djava.net.preferIPv4Stack=true" + volumes: + - ./logs/keycloak:/tmp/logs + - ./keycloak/imports/opencdmp-realm.json:/opt/keycloak/data/import/opencdmp-realm.json + expose: + - "8080" + networks: + - opencdmp-proxy-network + - opencdmp-postgres-shared-network + - opencdmp-keycloak-shared-network -############################## RABBITMQ ############################################### +################################# RABBITMQ ############################################### opencdmp.rabbitmq: labels: NAME: "rabbitmq" @@ -243,7 +243,7 @@ services: - opencdmp-proxy-network - opencdmp-rabbitmq-shared-network -############################## GOTENBERG ############################################## +################################# GOTENBERG ############################################## opencdmp.gotenberg: cpus: 2 mem_limit: 2048m diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml index 3ef89c1b9..78c1cf157 100644 --- a/deployment/docker-compose.yml +++ b/deployment/docker-compose.yml @@ -23,20 +23,20 @@ services: opencdmp.backend: container_name: opencdmp.backend image: ${DOCKER_REGISTRY}open-dmp-api:${MAIN_APP_TAG} - # depends_on: - # - opencdmp.postgres + depends_on: + - opencdmp.postgres opencdmp.notification: container_name: opencdmp.notification image: ${DOCKER_REGISTRY}open-dmp-notification-api:${NOTIFICATION_APP_TAG} - # depends_on: - # - opencdmp.postgres + depends_on: + - opencdmp.postgres opencdmp.annotation: container_name: opencdmp.annotation image: ${DOCKER_REGISTRY}open-dmp-annotation-api:${ANNOTATION_APP_TAG} - # depends_on: - # - opencdmp.postgres + depends_on: + - opencdmp.postgres # # ############################## FILE-TRANSFORMERS ####################################### @@ -60,22 +60,22 @@ services: - opencdmp.backend ############################## POSTGRES 16 ############################################ - # opencdmp.postgres: - # container_name: opencdmp.postgres - # image: postgres:${POSTGRES_TAG} + opencdmp.postgres: + container_name: opencdmp.postgres + image: postgres:${POSTGRES_TAG} ################################# ELASTICSEARCH ################################################# opencdmp.elasticsearch: container_name: opencdmp.elasticsearch image: docker.elastic.co/elasticsearch/elasticsearch:${ELK_TAG} -############################## KEYCLOAK ############################################### - # opencdmp.keycloak: - # container_name: opencdmp.keycloak - # image: quay.io/keycloak/keycloak:${KEYCLOAK_TAG} - # depends_on: - # opencdmp.postgres: - # condition: service_healthy +############################# KEYCLOAK ############################################### + opencdmp.keycloak: + container_name: opencdmp.keycloak + image: quay.io/keycloak/keycloak:${KEYCLOAK_TAG} + depends_on: + opencdmp.postgres: + condition: service_healthy ############################## RABBITMQ ############################################### opencdmp.rabbitmq: diff --git a/deployment/elk/elasticsearch/index_init.sh b/deployment/elk/elasticsearch/index_init.sh index dcf6b3b1c..4e84456ca 100644 --- a/deployment/elk/elasticsearch/index_init.sh +++ b/deployment/elk/elasticsearch/index_init.sh @@ -4,7 +4,7 @@ echo "Elasticsearch is now available. Proceeding with initialization..." echo "Creating Elasticsearch indexes, roles, and users..." # Command to create the "plans" index -curl -XPUT "http://localhost:9200/plans" -u elastic:elastic -H 'Content-Type: application/json' -d '{ +curl -XPUT "http://localhost:9200/opencdmp-plans-test" -u elastic:elastic -H 'Content-Type: application/json' -d '{ "settings": { "number_of_shards": 1, "number_of_replicas": 1 @@ -20,7 +20,7 @@ curl -XPUT "http://localhost:9200/plans" -u elastic:elastic -H 'Content-Type: ap }' # Command to create the "descriptions" index -curl -XPUT "http://localhost:9200/descriptions" -u elastic:elastic -H 'Content-Type: application/json' -d '{ +curl -XPUT "http://localhost:9200/opencdmp-descriptions-test" -u elastic:elastic -H 'Content-Type: application/json' -d '{ "settings": { "number_of_shards": 1, "number_of_replicas": 1 @@ -37,7 +37,7 @@ curl -XPUT "http://localhost:9200/descriptions" -u elastic:elastic -H 'Content-T curl -XPOST "localhost:9200/_security/role/opencdmp-api-test" -u elastic:elastic -H 'Content-Type: application/json' -d '{ "indices": [ { - "names": [ "opencdmp-*-test" ], + "names": [ "opencdmp-plans-test", "opencdmp-descriptions-test" ], "privileges": [ "all" ] } ] @@ -45,6 +45,8 @@ curl -XPOST "localhost:9200/_security/role/opencdmp-api-test" -u elastic:elastic curl -XPOST "localhost:9200/_security/user/opencdmp-api-test?pretty" -u elastic:elastic -H 'Content-Type: application/json' -d' { - "password" : "your_password_here", + "password" : "opencdmp", "roles" : [ "opencdmp-api-test" ] -}' \ No newline at end of file +}' + +elasticsearch-plugin install analysis-icu \ No newline at end of file diff --git a/deployment/keycloak/imports/opencdmp-realm.json b/deployment/keycloak/imports/opencdmp-realm.json index 3d3e38c08..ae97eb87c 100644 --- a/deployment/keycloak/imports/opencdmp-realm.json +++ b/deployment/keycloak/imports/opencdmp-realm.json @@ -773,6 +773,45 @@ ], "notBefore": 0, "groups": [] + }, + { + "username": "opencdmp-admin", + "enabled": true, + "email": "opencdmp@admin.com", + "emailVerified": true, + "credentials": [ + { + "type": "password", + "value": "admin" + } + ], + "realmRoles": [ + "default-roles-dmp-staging" + ], + "groups": [ + "/opencdmp-app/role-admin", + "/opencdmp-app/tenant-role-admin/tenant-default" + ] + }, + { + "username": "dmp-keycloak-api", + "enabled": true, + "email": "dmp@api.com", + "emailVerified": true, + "credentials": [ + { + "type": "password", + "value": "admin" + } + ], + "realmRoles": [ + "default-roles-dmp-staging", + "realm-admin" + ], + "groups": [ + "/opencdmp-app/role-user", + "/opencdmp-app/tenant-role-user/tenant-default" + ] } ], "scopeMappings": [ diff --git a/deployment/opencdmp/backend/config/app.env b/deployment/opencdmp/backend/config/app.env index 242d886cd..d064cce8d 100644 --- a/deployment/opencdmp/backend/config/app.env +++ b/deployment/opencdmp/backend/config/app.env @@ -8,9 +8,9 @@ ELASTIC_ENABLED=true ELASTIC_USE_SSL=false ELASTIC_HOST=opencdmp.elasticsearch:9200 ELASTIC_USER= opencdmp-api-test -ELASTIC_PASS=your_password_here -ELASTIC_DMP_INDEX=plans -ELASTIC_DESCRIPTION_INDEX=descriptions +ELASTIC_PASS=opencdmp +ELASTIC_DMP_INDEX=opencdmp-plans-test +ELASTIC_DESCRIPTION_INDEX=opencdmp-descriptions-test #SERVER WEB_PORT=8081 diff --git a/deployment/opencdmp/backend/config/metrics-test.yml b/deployment/opencdmp/backend/config/metrics-test.yml index 5e9147e8f..7e3e1eb81 100644 --- a/deployment/opencdmp/backend/config/metrics-test.yml +++ b/deployment/opencdmp/backend/config/metrics-test.yml @@ -3,7 +3,7 @@ metrics: enable: true intervalSeconds: 600 nexusDate: "2021-01-01T00:00:00.00Z" - usersLoginClient: ${IDP_APIKEY_CLIENT_ID_UUID:} + usersLoginClient: ${IDP_APIKEY_CLIENT_ID_UUID} referenceTypes: funderIds: ["538928bb-c7c6-452e-b66d-08e539f5f082"] grantIds: ["5b9c284f-f041-4995-96cc-fad7ad13289c"] diff --git a/deployment/opencdmp/file-transformer-docx/config/logging-test.yml b/deployment/opencdmp/file-transformer-docx/config/logging-test.yml new file mode 100644 index 000000000..e877dceba --- /dev/null +++ b/deployment/opencdmp/file-transformer-docx/config/logging-test.yml @@ -0,0 +1,2 @@ +logging: + config: /config/logging/logback-${spring.profiles.active}.xml diff --git a/deployment/opencdmp/file-transformer-docx/config/logging/logback-test.xml b/deployment/opencdmp/file-transformer-docx/config/logging/logback-test.xml new file mode 100644 index 000000000..a90075d1e --- /dev/null +++ b/deployment/opencdmp/file-transformer-docx/config/logging/logback-test.xml @@ -0,0 +1,67 @@ + + + + + %date{ISO8601} [%thread] %-5level %logger{36} [%X{req.id}] - %message%n + + + + + /logs/logging.log + + logs/logging.%d{yyyy-MM-dd}.%i.log + + 100MB + + 15 + + + %date{ISO8601} [%thread] %-5level %logger{36} [%X{req.id}] - %message%n + + + + + /logs/auditing.log + + logs/auditing.%d{yyyy-MM-dd}.%i.log + + 100MB + + 15 + + + %date{ISO8601} - %X{req.id} - %message%n + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deployment/opencdmp/file-transformer-rda-json/config/logging-test.yml b/deployment/opencdmp/file-transformer-rda-json/config/logging-test.yml new file mode 100644 index 000000000..e877dceba --- /dev/null +++ b/deployment/opencdmp/file-transformer-rda-json/config/logging-test.yml @@ -0,0 +1,2 @@ +logging: + config: /config/logging/logback-${spring.profiles.active}.xml diff --git a/deployment/opencdmp/file-transformer-rda-json/config/logging/logback-test.xml b/deployment/opencdmp/file-transformer-rda-json/config/logging/logback-test.xml new file mode 100644 index 000000000..a90075d1e --- /dev/null +++ b/deployment/opencdmp/file-transformer-rda-json/config/logging/logback-test.xml @@ -0,0 +1,67 @@ + + + + + %date{ISO8601} [%thread] %-5level %logger{36} [%X{req.id}] - %message%n + + + + + /logs/logging.log + + logs/logging.%d{yyyy-MM-dd}.%i.log + + 100MB + + 15 + + + %date{ISO8601} [%thread] %-5level %logger{36} [%X{req.id}] - %message%n + + + + + /logs/auditing.log + + logs/auditing.%d{yyyy-MM-dd}.%i.log + + 100MB + + 15 + + + %date{ISO8601} - %X{req.id} - %message%n + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deployment/opencdmp/zenodo/config/logging-test.yml b/deployment/opencdmp/zenodo/config/logging-test.yml new file mode 100644 index 000000000..e877dceba --- /dev/null +++ b/deployment/opencdmp/zenodo/config/logging-test.yml @@ -0,0 +1,2 @@ +logging: + config: /config/logging/logback-${spring.profiles.active}.xml diff --git a/deployment/opencdmp/zenodo/config/logging/logback-test.xml b/deployment/opencdmp/zenodo/config/logging/logback-test.xml new file mode 100644 index 000000000..a90075d1e --- /dev/null +++ b/deployment/opencdmp/zenodo/config/logging/logback-test.xml @@ -0,0 +1,67 @@ + + + + + %date{ISO8601} [%thread] %-5level %logger{36} [%X{req.id}] - %message%n + + + + + /logs/logging.log + + logs/logging.%d{yyyy-MM-dd}.%i.log + + 100MB + + 15 + + + %date{ISO8601} [%thread] %-5level %logger{36} [%X{req.id}] - %message%n + + + + + /logs/auditing.log + + logs/auditing.%d{yyyy-MM-dd}.%i.log + + 100MB + + 15 + + + %date{ISO8601} - %X{req.id} - %message%n + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deployment/postgres/opencdmp_init.sql b/deployment/postgres/opencdmp_init.sql index cb124c5db..61204edcd 100644 --- a/deployment/postgres/opencdmp_init.sql +++ b/deployment/postgres/opencdmp_init.sql @@ -146,6 +146,88 @@ CREATE TABLE public."DBVersion" ( description text ); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.001', '2020-03-31 08:34:54.236152+00', '2020-04-02 08:24:17.982713+00', 'Add Database Versioning'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.002', '2020-05-04 10:42:00+00', '2020-05-12 16:04:59.286316+00', 'Add User Association'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.003', '2020-05-06 15:11:00+00', '2020-07-01 17:21:42.011329+00', 'Add Doi Funder'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.004', '2020-06-03 09:00:00+00', '2020-07-01 17:22:08.818043+00', 'Add language to DMP and Dataset Template'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.005', '2020-06-03 09:00:00+00', '2020-07-01 17:22:16.127889+00', 'Remove user association table'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.006', '2020-10-26 07:10:00+00', '2021-05-19 08:26:52.487759+00', 'Update Credential and LoginConfirmationEmail tables'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.007', '2020-10-27 10:40:00+00', '2021-05-19 08:27:15.799832+00', 'Add userstatus on UserInfo table'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.008', '2021-04-05 14:48:00+00', '2021-05-19 08:41:47.653423+00', 'Add Dataset Profile User Table'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.008', '2021-04-05 14:48:00+00', '2021-05-19 10:38:30.376503+00', 'Add Dataset Profile User Table'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.009', '2022-03-03 13:50:00+00', '2022-05-16 07:41:15.567827+00', 'Add File Table for uploaded files'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.010', '2022-10-27 08:50:00+00', '2023-02-28 09:48:20.924562+00', 'Add Doi Table for depositions'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.011', '2022-10-27 08:50:00+00', '2023-02-28 09:48:30.770555+00', 'Migrate DMP.DOI to EntityDoi table'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.012', '2022-10-27 08:50:00+00', '2023-02-28 09:48:38.792902+00', 'Delete doi column from dmp table'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.013', '2023-06-21 10:00:00+00', '2024-02-15 10:26:07.69147+00', 'Add Description Template Type table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.014', '2023-06-21 10:00:00+00', '2024-02-15 10:26:18.074713+00', 'Rename DatasetProfile Table to DescriptionTemplate and add column Type referencing the DescriptionTemplateType.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.015', '2023-09-01 10:00:00+00', '2024-02-15 10:26:28.577243+00', 'Add column DmpSectionIndex to Dataset table and data to DMPDatasetProfile.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.016', '2023-09-12 10:00:00+00', '2024-02-15 10:26:49.804431+00', 'Insert default blueprint, update profile of existing dmps and update DmpSectionIndex for each dataset.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.017', '2023-09-18 10:00:00+00', '2024-02-15 10:26:57.336389+00', 'Make grant column of dmp table not null.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.000', '2023-11-22 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add Reference, ReferenceType, SupportiveMaterial'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.001', '2023-10-19 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Align Description Template Type.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.002', '2023-10-19 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Align Entity Doi table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.003', '2023-10-19 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add UserSettings table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.004', '2023-10-27 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Align dmp blueprint table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.005', '2023-10-27 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add Dmp table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.006', '2023-10-27 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add DescriptionReference table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.007', '2023-10-27 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add Description table (former Dataset).'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.008', '2023-10-27 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add DescriptionReference table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.009', '2023-10-27 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Drop old dataset related tables.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.010', '2023-11-02 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Aling DescriptionTemplate table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.011', '2023-11-02 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Aling UserDescriptionTemplate table (former UserDatasetProfile).'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.012', '2023-11-02 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add Dmp Description Template table (former DMPDatasetProfile).'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.013', '2023-11-07 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add Dmp User table (former UserDMP).'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.014', '2023-11-20 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Sync table Description.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.015', '2023-11-20 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table tag.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.016', '2023-11-20 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table DescriptionTag.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.017', '2023-11-20 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table User.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.018', '2023-11-20 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table UserCredential.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.019', '2023-11-20 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table UserContactInfo.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.020', '2023-11-20 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Sync table UserRole.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.021', '2023-11-20 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Sync user tables data.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.022', '2023-11-20 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Update user tables fks.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.023', '2023-11-20 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table Tenant.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.024', '2023-11-27 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table Language.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.025', '2023-11-20 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table StorageFile.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.026', '2023-11-29 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'ALter table Language.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.027', '2023-12-05 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Rename table Notification to NotificationLegacy.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.028', '2023-12-05 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table QueueOutbox.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.029', '2023-12-05 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table QueueInbox.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.030', '2023-12-05 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add tables ntf_Tenant and ntf_TenantConfiguration.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.031', '2024-01-24 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ntf_User.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.032', '2023-12-05 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ntf_Notification.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.033', '2024-01-24 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ntf_UserContactInfo.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.034', '2024-01-24 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ntf_UserCredential.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.035', '2024-01-25 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ntf_TenantUser.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.036', '2023-12-15 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add ntf_NotificationTemplate table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.037', '2023-12-05 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ntf_QueueInbox.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.038', '2023-12-05 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ntf_QueueOutbox.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.039', '2023-12-05 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ntf_InAppNotification.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.040', '2023-12-05 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ntf_UserNotificationPreference.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.041', '2023-12-06 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table TenantUser.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.042', '2023-12-06 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Rename usersettings Table to UserSettings.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.043', '2023-12-06 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add Tenant Id to tables.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.044', '2023-12-08 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Drop old Lock Table and create New Lock table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.045', '2023-12-13 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add ActionConfirmation table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.046', '2023-12-27 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Change Entity Type To Enum at Entity DOI table'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.047', '2024-02-02 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add versioning on dmp blueprint table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.048', '2024-02-13 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add tables ant_Tenant and ant_TenantConfiguration.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.049', '2024-02-13 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ant_QueueInbox.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.050', '2024-02-13 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ant_QueueOutbox.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.051', '2024-02-13 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ant_User.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.052', '2024-02-13 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ant_UserCredential.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.053', '2024-02-13 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ant_TenantUser.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.054', '2024-02-21 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add Section_id Column to DmpUser Table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.055', '2024-02-20 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ant_Annotation.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.056', '2024-02-20 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ant_EntityUser.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.057', '2024-02-22 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add PrefillingSource table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.058', '2024-02-28 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add table ant_UserContactInfo.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.059', '2024-03-07 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add columns on ant_Annotaion table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.060', '2024-03-26 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add Language, Prefilling Source, Reference Type values.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.061', '2024-03-27 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Remove DMP fkey from EntityDoi Table.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.062', '2024-04-08 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add currency reference type value.'); +INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.063', '2024-04-19 10:00:00+00', '2024-05-08 13:42:55.229528+00', 'Add TenantConfiguration Table.'); -- -- TOC entry 220 (class 1259 OID 63781) @@ -505,6 +587,8 @@ CREATE TABLE public."DescriptionTemplateType" ( tenant uuid ); +INSERT INTO public."DescriptionTemplateType" VALUES ('3e55320b-67c9-4758-bb0b-27d9cfb172c0', 'Admin', 0, '2024-05-13 07:55:05.859681', '2024-05-13 07:55:16.153843', 0, NULL); + -- -- TOC entry 235 (class 1259 OID 63880) @@ -552,6 +636,8 @@ CREATE TABLE public."DmpBlueprint" ( version_status smallint NOT NULL ); +INSERT INTO public."DmpBlueprint" VALUES ('86635178-36a6-484f-9057-a934e4eeecd5', 'Dmp Default Blueprint', '
', 1, '2024-02-15 10:26:49.804431', '2024-02-15 10:26:49.804431', 1, NULL, 'c905f3f1-9f55-45e7-953b-c370c465c02b', 1, 0); + -- -- TOC entry 237 (class 1259 OID 63899) @@ -822,6 +908,18 @@ CREATE TABLE public."Language" ( tenant uuid ); +INSERT INTO public."Language" VALUES ('94b2ead6-e27c-45f5-a986-14dda5a58376', 'en', NULL, '2023-11-28 16:35:18.114652', '2023-11-29 15:50:57.253892', 1, 0, NULL); +INSERT INTO public."Language" VALUES ('defd282e-48d0-4f69-9b99-4137d5ce05af', 'gr', NULL, '2023-11-28 16:35:18.114652', '2023-11-29 15:50:57.253892', 1, 1, NULL); +INSERT INTO public."Language" VALUES ('1213a820-e6bb-492e-b63b-06a8c650ef92', 'es', NULL, '2023-11-28 16:35:18.114652', '2023-11-29 15:50:57.253892', 1, 3, NULL); +INSERT INTO public."Language" VALUES ('d8bb2f19-048d-4806-b99a-efdafe36de52', 'de', NULL, '2023-11-28 16:35:18.114652', '2023-11-29 15:50:57.253892', 1, 0, NULL); +INSERT INTO public."Language" VALUES ('acb16ec4-dbad-4aec-b6a0-214ebacc2983', 'hr', NULL, '2023-11-28 16:35:18.114652', '2023-11-29 15:50:57.253892', 1, 4, NULL); +INSERT INTO public."Language" VALUES ('c9d8850c-c459-47b1-98d1-9c21b614ae7b', 'hr', NULL, '2024-02-29 16:35:18.114652', '2024-02-29 16:35:18.114652', 1, 5, NULL); +INSERT INTO public."Language" VALUES ('96b9c91a-a9e4-4a66-9361-a1eba22cc971', 'tr', NULL, '2024-02-29 16:35:18.114652', '2024-02-29 16:35:18.114652', 1, 6, NULL); +INSERT INTO public."Language" VALUES ('cdbb160f-a655-46eb-8328-589144e5a484', 'sk', NULL, '2024-02-29 16:35:18.114652', '2024-02-29 16:35:18.114652', 1, 7, NULL); +INSERT INTO public."Language" VALUES ('57c6129a-a918-4fb0-9c5b-9ec1c2ee1341', 'sr', NULL, '2024-02-29 16:35:18.114652', '2024-02-29 16:35:18.114652', 1, 8, NULL); +INSERT INTO public."Language" VALUES ('110d2e49-1580-4ee3-b1df-84da966f97a8', 'pt', NULL, '2024-02-29 16:35:18.114652', '2024-02-29 16:35:18.114652', 1, 9, NULL); +INSERT INTO public."Language" VALUES ('3b865f61-a863-43de-98cd-da86fc3f5940', 'pl', NULL, '2024-02-29 16:35:18.114652', '2024-02-29 16:35:18.114652', 1, 10, NULL); + -- -- TOC entry 249 (class 1259 OID 63979) @@ -957,6 +1055,7 @@ CREATE TABLE public."PrefillingSource" ( ); + -- -- TOC entry 253 (class 1259 OID 64001) -- Name: Project; Type: TABLE; Schema: public; Owner: - @@ -1063,6 +1162,20 @@ CREATE TABLE public."ReferenceType" ( updated_at timestamp without time zone NOT NULL, tenant uuid ); +INSERT INTO public."ReferenceType" VALUES ('2baab1e8-561f-4c15-84c3-571b811c52f6', 'Licenses', 'licenses', 'opendefinition100falseapplication/vnd.api+json; charset=utf-8local10$[*]reference_ididlabeltitledescriptionmaintaineruriurl$[*]https://licenses.opendefinition.org/licenses/groups/all.json', 1, '2023-11-16 16:24:12.162675', '2024-04-29 08:41:29.944368', NULL); +INSERT INTO public."ReferenceType" VALUES ('2beacaad-3223-43ad-ad99-1e5f21328e7b', 'Registries', 'registries', 'rda-metadata-schemes100falseapplication/json; charset=utf-8remote10$[''meta''][''pagination''][''page'',''pages'',''count'']{like}likereference_idmscidlabeltitledescriptiondescriptionurluri$[''data''][''items''][*]https://rdamsc.bath.ac.uk/api2/m?q={like}&start=1&pageSize={pageSize}', 1, '2023-11-16 10:08:21.240804', '2024-02-16 09:16:50.456347', NULL); +INSERT INTO public."ReferenceType" VALUES ('3d372db5-a456-45e6-a845-e41e1a8311f8', 'Projects', 'projects', 'project11', 1, '2023-11-17 08:55:05.190807', '2023-11-17 08:56:23.012619', NULL); +INSERT INTO public."ReferenceType" VALUES ('51225b6a-86a6-48ac-9192-f15096dbcb8a', 'Publications', 'publications', 'openaire100falseapplication/json;charset=UTF-8remote00$[''meta''][''pagination''][''page'',''pages'',''count'']{like}*likereference_idoriginalId.first()labeltitle..content.first()descriptiontitle..content.first()pid[''pid''][''content'']pidTypeField[''pid''][''classid'']$[''results''][*][''result''][''metadata''][''oaf:entity''][''oaf:result'']https://services.openaire.eu/search/v2/api/resources?query=oaftype exact result and {like}&page={page}&size={pageSize}&format=json', 1, '2023-11-16 13:07:20.591433', '2024-05-01 11:47:04.982439', NULL); +INSERT INTO public."ReferenceType" VALUES ('538928bb-c7c6-452e-b66d-08e539f5f082', 'Funders', 'funders', 'openaire101falseapplication/json; charset=utf-8local00$[*]reference_ididlabelnamedescriptionname$[''refineResults''][''relfunder''][*]https://services.openaire.eu/search/v2/api/results?&refine=true&fields=relfunder&page={page}&size=0&format=json&sf=relfunder', 1, '2023-11-16 11:22:57.942097', '2024-02-16 09:16:19.195353', NULL); +INSERT INTO public."ReferenceType" VALUES ('5a2112e7-ea99-4cfe-98a1-68665e26726e', 'Researchers', 'researchers', 'orcid100falseapplication/json; charset=UTF-8remote00$[''num-found'']^[A-Za-z0-9]+ [A-Za-z0-9]+$ ((given-names:{like1}+AND+family-name:{like2})+OR+(given-names:{like2}+AND+family-name:{like1}))\d{4}-\d{4}-\d{4}-\d{4}orcid:{like}.+given-names:{like}+OR+family-name:{like}*likereference_idorcid-idlabel@{{given-names}} @{{family-names}} (@{{orcid-id}})descriptioninstitution-namefistNamegiven-nameslastNamefamily-names$[''expanded-result''][*]https://pub.orcid.org/v3.0/expanded-search/?q={like}&start={page}&rows={pageSize}', 1, '2023-11-16 18:21:43.272982', '2024-04-17 09:44:53.656849', NULL); +INSERT INTO public."ReferenceType" VALUES ('5b9c284f-f041-4995-96cc-fad7ad13289c', 'Grants', 'grants', 'openaire1538928bb-c7c6-452e-b66d-08e539f5f08200falseapplication/json; charset=utf-8remote00$[''meta''][''pagination''][''page'',''pages'',''count'']{like}*like538928bb-c7c6-452e-b66d-08e539f5f082openaire&fq=(funder exact "{reference}")funderQueryreference_idoriginalIdlabel@{{title}} (@{{originalId}})descriptiontitle$[''results''][*][''result''][''metadata''][''oaf:entity''][''oaf:project'']https://services.openaire.eu/search/v2/api/resources?query=((oaftype exact project) and ((projectcode_nt exact "{like}")or({like}))){funderQuery}&page={page}&size={pageSize}&format=json', 1, '2023-11-16 16:41:53.106646', '2024-04-29 09:00:22.237691', NULL); +INSERT INTO public."ReferenceType" VALUES ('7eeffb98-58fb-4921-82ec-e27f32f8e738', 'Organisations', 'organisations', 'openaire100falseapplication/json; charset=utf-8remote00$[''meta''][''pagination''][''page'',''pages'',''count'']{like}likereference_idoriginalIdlabellegalnamedescriptionlegalnamepid[''pid''][''content'']pidTypeField[''pid''][''classid'']$[''results''][*][''result''][''metadata''][''oaf:entity''][''oaf:organization'']https://services.openaire.eu/search/v2/api/organizations/?q={like}&page={page}&size={pageSize}&format=json', 1, '2023-11-17 10:13:15.873808', '2024-02-16 15:35:47.874131', NULL); +INSERT INTO public."ReferenceType" VALUES ('8ec7556b-749d-4c4a-a4b9-43d064693795', 'Journals', 'journals', 'openaire100falseapplication/jsonremote01$[''meta''][''pagination''][''page'',''pages'',''count'']{like}like{"officialname": "{like}", "typology":"journal"}reference_ididlabelofficialnamedescriptionofficialname$[''datasourceInfo''][*]https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDING', 1, '2023-11-16 17:40:12.811667', '2024-02-16 09:09:22.816978', NULL); +INSERT INTO public."ReferenceType" VALUES ('9ec2000d-95c7-452e-b356-755fc8e2574c', 'Services', 'services', 'eosc100falseapplication/json; charset=utf-8remote00$[''from'',''to'',''total'']{like}likereference_ididlabelnamedescriptiondescriptionuriwebpage$[''results''][*]https://providers.eosc-portal.eu/api/service/all?query={like}&from={page}&quantity={pageSize}', 1, '2023-11-16 17:57:22.081053', '2024-02-16 09:07:13.944104', NULL); +INSERT INTO public."ReferenceType" VALUES ('a3ce0fb2-d72c-48bb-b322-7401940cb802', 'Datasets', 'datasets', 'openaire100falseapplication/json; charset=utf-8remote00$[''meta''][''pagination''][''page'',''pages'',''count'']{like}likereference_idoriginalIdlabeltitle..content.first()descriptiontitle..content.first()pid[''pid''][''content'']pidTypeField[''pid''][''classid'']$[''results''][*][''result''][''metadata''][''oaf:entity''][''oaf:result'']https://services.openaire.eu/search/v2/api/datasets/?q={like}&page={page}&size={pageSize}&format=json', 1, '2023-11-17 10:26:55.332111', '2024-05-01 10:34:07.029327', NULL); +INSERT INTO public."ReferenceType" VALUES ('ab7cdd93-bea2-440d-880d-3846dad80b21', 'Taxonomies', 'taxonomies', 'taxonomy11', 1, '2023-11-16 17:48:09.769599', '2024-04-25 12:36:57.923984', NULL); +INSERT INTO public."ReferenceType" VALUES ('d26b64ba-fda0-4b14-b3ef-9856a492d55a', 'Repositories', 'repositories', 'openaire100falseapplication/jsonremote01$[''meta''][''pagination''][''page'',''pages'',''count'']{like}like{"officialname": "{like}", "typology":"data"}reference_ididlabelofficialnamedescriptionofficialname$[''datasourceInfo''][*]https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDING', 1, '2023-11-16 17:10:33.849688', '2024-02-16 12:45:18.66016', NULL); +INSERT INTO public."ReferenceType" VALUES ('1e927daa-b856-443f-96da-22f325f7322f', 'Publication Repositories', 'pubRepositories', 'openaire100falseapplication/jsonremote01$[''meta''][''pagination''][''page'',''pages'',''count'']{like}like{"officialname": "{like}", "typology":"pubsrepository::institutional"}reference_ididlabelofficialnamedescriptionofficialname$[''datasourceInfo''][*]https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDINGopenaire200falseapplication/jsonremote01$[''meta''][''pagination''][''page'',''pages'',''count'']{like}like{"officialname": "{like}", "typology":"pubsrepository::thematic"}reference_ididlabelofficialnamedescriptionofficialname$[''datasourceInfo''][*]https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDINGopenaire300falseapplication/jsonremote01$[''meta''][''pagination''][''page'',''pages'',''count'']{like}like{"officialname": "{like}", "typology":"pubsrepository::unknown"}reference_ididlabelofficialnamedescriptionofficialname$[''datasourceInfo''][*]https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDING', 1, '2023-11-16 17:17:40.882679', '2024-05-01 11:52:50.297337', NULL); -- diff --git a/deployment/proxy/ProxyNginx.conf b/deployment/proxy/ProxyNginx.conf index 71364910f..c7f80b91d 100644 --- a/deployment/proxy/ProxyNginx.conf +++ b/deployment/proxy/ProxyNginx.conf @@ -49,31 +49,31 @@ server { proxy_redirect http://opencdmp.backend:8080 http://host.docker.internal:8081/api; } - # location /api/notification/ { + location /api/notification/ { - # proxy_set_header Host $host; - # proxy_set_header X-Real-IP $remote_addr; - # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; - # # Fix the “It appears that your reverse proxy set up is broken" error. - # proxy_pass http://opencdmp.notification:8080; - # proxy_read_timeout 90; - # proxy_redirect http://opencdmp.notification:8080 http://host.docker.internal:8081/api/notification; - # } + # Fix the “It appears that your reverse proxy set up is broken" error. + proxy_pass http://opencdmp.notification:8080; + proxy_read_timeout 90; + proxy_redirect http://opencdmp.notification:8080 http://host.docker.internal:8081/api/notification; + } - # location /api/annotation/ { + location /api/annotation/ { - # proxy_set_header Host $host; - # proxy_set_header X-Real-IP $remote_addr; - # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; - # # Fix the “It appears that your reverse proxy set up is broken" error. - # proxy_pass http://opencdmp.annotation:8080; - # proxy_read_timeout 90; - # proxy_redirect http://opencdmp.annotation:8080 http://host.docker.internal:8081/api/annotation; - # } + # Fix the “It appears that your reverse proxy set up is broken" error. + proxy_pass http://opencdmp.annotation:8080; + proxy_read_timeout 90; + proxy_redirect http://opencdmp.annotation:8080 http://host.docker.internal:8081/api/annotation; + } location /keycloak/ {