From 2fbd41c9d87856e200796cc514d3320c982461ac Mon Sep 17 00:00:00 2001 From: amandilaras Date: Tue, 14 May 2024 16:37:57 +0300 Subject: [PATCH] Deployment optimizations and fixes --- deployment/.env | 9 +++---- deployment/deploy_opencdmp.sh | 1 + deployment/docker-compose.override.yml | 6 ----- .../keycloak/imports/opencdmp-realm.json | 4 +++ deployment/opencdmp/annotation/config/app.env | 18 +------------- .../annotation/config/cipher-test.yml | 12 --------- .../opencdmp/annotation/config/db-test.yml | 12 +-------- .../opencdmp/annotation/config/email-test.yml | 14 ----------- .../config/logging/logback-test.xml | 9 ------- .../opencdmp/annotation/config/queue-test.yml | 4 --- .../annotation/config/security-test.yml | 14 ----------- .../annotation/config/server-test.yml | 1 - .../backend/certificates/client-identity.p12 | Bin 2681 -> 0 bytes .../certificates/elasticsearch_dev04.crt | 20 --------------- deployment/opencdmp/backend/config/app.env | 16 ++---------- .../opencdmp/backend/config/db-test.yml | 9 +------ .../backend/config/elasticsearch-test.yml | 23 ------------------ .../backend/config/logging/logback-test.xml | 8 ------ .../opencdmp/backend/config/metrics-test.yml | 4 +++ .../opencdmp/backend/config/security-test.yml | 11 ++------- .../config/logging/logback-test.xml | 11 --------- .../file-transformer-docx/config/pdf-test.yml | 3 --- .../config/storage-test.yml | 4 --- .../config/logging/logback-test.xml | 10 -------- .../config/storage-test.yml | 4 --- deployment/opencdmp/frontend/config.json | 5 ++++ .../opencdmp/notification/config/app.env | 23 ++++-------------- .../notification/config/cipher-test.yml | 12 --------- .../opencdmp/notification/config/db-test.yml | 19 +++------------ .../notification/config/email-test.yml | 14 ----------- .../config/logging/logback-test.xml | 9 ------- .../notification/config/notification-test.yml | 2 +- .../notification/config/queue-test.yml | 4 --- .../notification/config/security-test.yml | 14 ----------- .../notification/config/server-test.yml | 1 - .../notification/config/tenant-test.yml | 3 +-- .../zenodo/config/logging/logback-test.xml | 11 --------- .../opencdmp/zenodo/config/security-test.yml | 2 -- .../opencdmp/zenodo/config/server-test.yml | 4 +-- .../opencdmp/zenodo/config/storage-test.yml | 4 --- 40 files changed, 35 insertions(+), 319 deletions(-) delete mode 100644 deployment/opencdmp/annotation/config/cipher-test.yml delete mode 100644 deployment/opencdmp/annotation/config/email-test.yml delete mode 100644 deployment/opencdmp/backend/certificates/client-identity.p12 delete mode 100644 deployment/opencdmp/backend/certificates/elasticsearch_dev04.crt delete mode 100644 deployment/opencdmp/backend/config/elasticsearch-test.yml delete mode 100644 deployment/opencdmp/file-transformer-docx/config/pdf-test.yml delete mode 100644 deployment/opencdmp/file-transformer-docx/config/storage-test.yml delete mode 100644 deployment/opencdmp/file-transformer-rda-json/config/storage-test.yml delete mode 100644 deployment/opencdmp/notification/config/cipher-test.yml delete mode 100644 deployment/opencdmp/notification/config/email-test.yml delete mode 100644 deployment/opencdmp/zenodo/config/storage-test.yml diff --git a/deployment/.env b/deployment/.env index 9627ce545..57eef950d 100644 --- a/deployment/.env +++ b/deployment/.env @@ -1,12 +1,9 @@ ###################### GENERAL ######################### -#User that is used to deploy the containers -DEPLOY_USER=1000 -DEPLOY_GROUP=1000 #version selections PROXY_TAG=mainline-alpine -MAIN_APP_TAG=2.1.8 -NOTIFICATION_APP_TAG=2.1.7 -ANNOTATION_APP_TAG=2.1.7 +MAIN_APP_TAG=2.1.10 +NOTIFICATION_APP_TAG=2.1.11 +ANNOTATION_APP_TAG=2.1.10 DOCX_APP_TAG=0.0.13 JSON_APP_TAG=0.0.9 ZENODO_APP_TAG=2.0.9 diff --git a/deployment/deploy_opencdmp.sh b/deployment/deploy_opencdmp.sh index c00aa4e9a..bd4ea15b7 100644 --- a/deployment/deploy_opencdmp.sh +++ b/deployment/deploy_opencdmp.sh @@ -22,6 +22,7 @@ for network in "${networks[@]}"; do done docker-compose down +docker-compose pull chmod 744 ./elk/elasticsearch/index_init.sh diff --git a/deployment/docker-compose.override.yml b/deployment/docker-compose.override.yml index 079c647b1..cbeea1677 100644 --- a/deployment/docker-compose.override.yml +++ b/deployment/docker-compose.override.yml @@ -34,7 +34,6 @@ services: - opencdmp-proxy-network - opencdmp-backend-network - opencdmp-plugins-network - - opencdmp-gotenberg-shared-network - opencdmp-elastic-shared-network - opencdmp-keycloak-shared-network - opencdmp-postgres-shared-network @@ -69,7 +68,6 @@ services: networks: - opencdmp-proxy-network - opencdmp-backend-network - - opencdmp-plugins-network - opencdmp-rabbitmq-shared-network - opencdmp-keycloak-shared-network - opencdmp-postgres-shared-network @@ -89,7 +87,6 @@ services: networks: - opencdmp-proxy-network - opencdmp-backend-network - - opencdmp-plugins-network - opencdmp-rabbitmq-shared-network - opencdmp-keycloak-shared-network - opencdmp-postgres-shared-network @@ -110,7 +107,6 @@ services: - ./logs/opencdmp/file-transformer-docx:/logs - ./storage/opencdmp/file-transformer-docx:/storage networks: - - opencdmp-backend-network - opencdmp-plugins-network - opencdmp-gotenberg-shared-network @@ -129,7 +125,6 @@ services: - ./logs/opencdmp/file-transformer-rda-json:/logs - ./storage/opencdmp/file-transformer-rda-json:/storage networks: - - opencdmp-backend-network - opencdmp-plugins-network # ############################## ZENODO ####################################### @@ -238,7 +233,6 @@ services: volumes: - /rabbitmq/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf:ro networks: - - opencdmp-proxy-network - opencdmp-rabbitmq-shared-network ################################# GOTENBERG ############################################## diff --git a/deployment/keycloak/imports/opencdmp-realm.json b/deployment/keycloak/imports/opencdmp-realm.json index ae97eb87c..92477d269 100644 --- a/deployment/keycloak/imports/opencdmp-realm.json +++ b/deployment/keycloak/imports/opencdmp-realm.json @@ -779,6 +779,8 @@ "enabled": true, "email": "opencdmp@admin.com", "emailVerified": true, + "firstName": "opencdmp", + "lastName": "admin", "credentials": [ { "type": "password", @@ -798,6 +800,8 @@ "enabled": true, "email": "dmp@api.com", "emailVerified": true, + "firstName": "keycloak", + "lastName": "api", "credentials": [ { "type": "password", diff --git a/deployment/opencdmp/annotation/config/app.env b/deployment/opencdmp/annotation/config/app.env index f4731af45..536cd4e6d 100644 --- a/deployment/opencdmp/annotation/config/app.env +++ b/deployment/opencdmp/annotation/config/app.env @@ -7,13 +7,6 @@ DB_PASSWORD=postgres-admin WEB_PORT=8087 #Security -IDP_APIKEY_CLIENT_ID=dmp_annotation -IDP_APIKEY_CLIENT_SECRET=annotation_secret -IDP_APIKEY_SCOPE=dmp_annotation-dedicated - -IDP_OPAQUE_CLIENT_ID= -IDP_OPAQUE_CLIENT_SECRET= - IDP_ISSUER_URI=http://host.docker.internal:8081/keycloak/realms/OpenCDMP QUEUE_APP_ID=opencdmp-annotation-dev @@ -21,13 +14,4 @@ QUEUE_APP_ID=opencdmp-annotation-dev RABBIT_HOST=opencdmp.rabbitmq RABBIT_PORT=5672 RABBIT_USER=guest -RABBIT_PASS=guest - -#EMAIL -MAIL_HOST=smtp.office365.com -MAIL_PORT=587 -MAIL_USERNAME= -MAIL_PASSWORD= -MAIL_AUTH=false -MAIL_TLS=true -MAIL_ADDRESS=dmp_annotation@admin.gr \ No newline at end of file +RABBIT_PASS=guest \ No newline at end of file diff --git a/deployment/opencdmp/annotation/config/cipher-test.yml b/deployment/opencdmp/annotation/config/cipher-test.yml deleted file mode 100644 index dcf9d5b5a..000000000 --- a/deployment/opencdmp/annotation/config/cipher-test.yml +++ /dev/null @@ -1,12 +0,0 @@ -cipher: - symetric-encryption: - default-o: null - options: - configuration: - aes: - key: ${CIPHER_SYMETRIC_ENCRYPTION_CONFIGURATION_AES_KEY:} - iv: ${CIPHER_SYMETRIC_ENCRYPTION_CONFIGURATION_AES_IV:} - queue: - aes: - key: ${CIPHER_SYMETRIC_ENCRYPTION_QUEUE_AES_KEY:} - iv: ${CIPHER_SYMETRIC_ENCRYPTION_QUEUE_AES_IV:} \ No newline at end of file diff --git a/deployment/opencdmp/annotation/config/db-test.yml b/deployment/opencdmp/annotation/config/db-test.yml index 17c722a5d..c5d78eea6 100644 --- a/deployment/opencdmp/annotation/config/db-test.yml +++ b/deployment/opencdmp/annotation/config/db-test.yml @@ -1,15 +1,5 @@ spring: - jpa: - show-sql: true - properties: - hibernate: - show_sql: true - format_sql: false datasource: maxIdle: 10 minIdle: 5 - maxActive: 10 - url: ${DB_CONNECTION_STRING} - username: ${DB_USER} - password: ${DB_PASSWORD} - driver-class-name: org.postgresql.Driver \ No newline at end of file + maxActive: 10 \ No newline at end of file diff --git a/deployment/opencdmp/annotation/config/email-test.yml b/deployment/opencdmp/annotation/config/email-test.yml deleted file mode 100644 index fb7c94ba0..000000000 --- a/deployment/opencdmp/annotation/config/email-test.yml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - mail: - host: ${MAIL_HOST:} - port: ${MAIL_PORT:} - username: ${MAIL_USERNAME:} - password: ${MAIL_PASSWORD:} - properties: - mail: - smtp: - auth: ${MAIL_AUTH:} - starttls: - enable: ${MAIL_TLS:} -email: - address: ${MAIL_ADDRESS:} \ No newline at end of file diff --git a/deployment/opencdmp/annotation/config/logging/logback-test.xml b/deployment/opencdmp/annotation/config/logging/logback-test.xml index c1392fea0..70770b39f 100644 --- a/deployment/opencdmp/annotation/config/logging/logback-test.xml +++ b/deployment/opencdmp/annotation/config/logging/logback-test.xml @@ -36,26 +36,17 @@ - - - - - - - - - diff --git a/deployment/opencdmp/annotation/config/queue-test.yml b/deployment/opencdmp/annotation/config/queue-test.yml index fa2fcb97f..5f9d8696b 100644 --- a/deployment/opencdmp/annotation/config/queue-test.yml +++ b/deployment/opencdmp/annotation/config/queue-test.yml @@ -1,9 +1,5 @@ queue: rabbitmq: - host: ${RABBIT_HOST} - port: ${RABBIT_PORT} - username: ${RABBIT_USER} - password: ${RABBIT_PASS} enable: true durable: true queue: cite_dmp_test_annotation_inbox_queue diff --git a/deployment/opencdmp/annotation/config/security-test.yml b/deployment/opencdmp/annotation/config/security-test.yml index 61b8ae049..41ffc81d7 100644 --- a/deployment/opencdmp/annotation/config/security-test.yml +++ b/deployment/opencdmp/annotation/config/security-test.yml @@ -1,21 +1,7 @@ web: security: - enabled: true - authorized-endpoints: [ api ] - allowed-endpoints: [ health ] idp: - api-key: - enabled: true - authorization-header: Authorization - client-id: ${IDP_APIKEY_CLIENT_ID:} - client-secret: ${IDP_APIKEY_CLIENT_SECRET:} - scope: ${IDP_APIKEY_SCOPE:} resource: - token-type: JWT #| opaque - opaque: - client-id: ${IDP_OPAQUE_CLIENT_ID:} - client-secret: ${IDP_OPAQUE_CLIENT_SECRET:} jwt: claims: [ role, x-role ] - issuer-uri: ${IDP_ISSUER_URI:} audiences: [ "dmp_annotation" ] \ No newline at end of file diff --git a/deployment/opencdmp/annotation/config/server-test.yml b/deployment/opencdmp/annotation/config/server-test.yml index 4974bc055..2a628f82f 100644 --- a/deployment/opencdmp/annotation/config/server-test.yml +++ b/deployment/opencdmp/annotation/config/server-test.yml @@ -1,3 +1,2 @@ server: - port: ${WEB_PORT} forward-headers-strategy: FRAMEWORK \ No newline at end of file diff --git a/deployment/opencdmp/backend/certificates/client-identity.p12 b/deployment/opencdmp/backend/certificates/client-identity.p12 deleted file mode 100644 index 0225d4e31059a6150bce842bc8c00a31b9a6ef48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2681 zcma)+S5Om*)`imuBm|^OkrDwxX$i&za->T+ROv)|QwX5Q1!Cw1401rFONbPeB29`S zO0P;lX@b%_A{}WW1i8%o|C}@T>E4Gud-k{XT8|4wfd_$rU=#(e2!&ms8c=_709k># z6u3Bq0v9>Kr%@D^m;WKLPF;`s9*6iDAU@v>x=w=l}ovYqam)D`owc=Zd2q@cNwtWsis8^&!pG+v7}TOQwqPbQXraf*mtT~d;~QdZFShf}vu#)?B zyay0CkAF{>G8{-4-EMx5(wn3mBr2r{uU(>#7d3I>w=6gEZ3j1Y6U{}U<4TN=zy{D< zsaUfqTyy`e4pQb6DIN9)D6|J6&~_>Z_F0#y+RdMApV8?ws}q)O1tb5Y(xQ2Z{cil% zRutW2spN+0XT?qnXzfa7gG#XemzwgRXB=I(lt zN;hO0VP9@l->Rl=cU~B;A0O>uqv}NZLprL$Mk4JmAqV@|)XBS12fhu|Ja8kyuZUAA zaBf`VidG|ftYFh!Nc^4nuZj(i?uu-%Oh*^dLc`3JKgqlP)$0t>0JjQx9n)ZVjQGe1 zVgwkH=B}eUl&owwMhmQq`@NGV#%3E4f)TD^yD4Dm9-DZ3hSTklzLJ=n`47hvs}{u~2iNs`GwBtQVd$q730)H2&wzGfK1y=~ zuPBwlNVLWol(~)dY@MSYvK+4+dZA1d$LLlOiO;8DqXwoF3DKEd1bc_x4WHic1bU!V z+tQl-a$H_a$&0+3rR`dMp*%_7LI;wgs%Op?%R1@v2qS~c1DAH-ygLt%H3v+bna;z5 zNA5nk4{5N_DPeR^Enl8LOdNG!N_a=$n^zQW4wkN3jp>w!&ngZ1OEmTBJso3!-BT*1 zF-r>;dfWmP4!BbbX-N)o#!do_(}nem+8Jd;CTgxISBxPuK^`ICv{u zOzsUyxCIla{hk#w6LqM2ZEWi|FZZfv>DPnjdt-CilAJfVxb5!!dVVAJQOL1&j5hA0 zB;Rbvm+VV9(Iw;V7owKYWqDSwYS(nXR><)NF*m zQ2VNQyZBeQup&|l%kQ#z+kOt^$haz8S{$1O-qf5a$D=N(wFySgdD{ntf2{aaq#-OpvD9lCNMHB_% z`u7tnG?xOgI6sp+ENDvauq zFkbz5GiceXd^w5&?mJC?Zp#g-cRZgF0l!=C8{Q)r!mmYz47MZ^(tGDQZrt|PH0M+q zkJ)Pq^AI>ko=P=UG0||OC5Gc};L~%eJAeDex$21RE8V*q9$Cco>~@&_S#oU&Y>pl7 zxs84LU}g@0U|!o!@_uDB5au4~m+)}2T$@oY>xjEEp;{+(uxor;CAF?0(^o^Rw0|5R zr5Xs>Jz%6dNlQ222^WIq*CNes{n=yD0|z40im`{nS7*LEil?68N%j=6+m(!yZFQT= z2+%^Bd$nD@={$Hjx|{{J*&yS+tl1dMyY;8p_LnTrRrg-5k7=UDxWAJpfgYdbe?Fl}G&iMh z`zQvoR6>7cZZHszR%?~MTk6M44nP?19bEspul3}>+4N2LjTpArABFg4kwT!uIT|Q8 z*`QV|vLTf$t0s|DIAU9Kx9b)?rrS25b1#@xkjq$q<@*$@wG8Y2us&JOLQ*aZFFg6k zdaFD?JdV89!n6A+{VP2Z(OnmJC4!^IW`kQrHA_j8o}phDTV%)<^#qZV$X6C*BzHc1 z&vO*_@_>b0LG*T`=h{@D*t!!_cm%fdFZ@<*vxrdv~w5}kj*NPR7K3x_Jf#G6pIQxER5 zeVNo@j2L{n{!QMwV=hIMwJt%K_fyFA(+SSz@C!ttgAGI)BF`a7E4y98b#-;P0N(6y zN)jE802_QamX&C z{_tRSsk8OBkSMqDi)n^Bam)1)Vdt;BNd2K)uqncct#`joiz6 diff --git a/deployment/opencdmp/backend/certificates/elasticsearch_dev04.crt b/deployment/opencdmp/backend/certificates/elasticsearch_dev04.crt deleted file mode 100644 index ebce955cd..000000000 --- a/deployment/opencdmp/backend/certificates/elasticsearch_dev04.crt +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDXDCCAkSgAwIBAgIUK8FEbNAIdyPoRF/pTyqNuL3kP54wDQYJKoZIhvcNAQEL -BQAwRzELMAkGA1UEBhMCR1IxDTALBgNVBAgMBENJVEUxDDAKBgNVBAcMA0FUSDEN -MAsGA1UECgwEQ0lURTEMMAoGA1UEAwwDZWxrMCAXDTIyMDkwODA4MjgxM1oYDzIx -MjIwODE1MDgyODEzWjAYMRYwFAYDVQQDDA1lbGFzdGljc2VhcmNoMIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoC6DoPC1kesTH0cKs1blVW8ddsQ3VmFO -ROJiUorhDIHB3sXJhCSw0hxZFNZtqgG35CTa5w3XiQMT1fr6Ar/ztOQmARg9CMQa -mOf8gR+tMTSwP7zr7WBR/1Q+GseeOnthFOfvfq7LLpRs8VNb/mhcSIjJsT9kMNXN -5iHIyEuGhQSwPZDUYx+6Ag4belQLvic+QYDhwvujtPFWj8qLSG7kTpbBK5ahH/5E -mvT5mpOYTR10f3LG4DKw7t6qG9tzh4WkwR0JYmlgxpAA/HBSa/QjS7CGxLrA4Sop -gQF8KQPEP/0w98EbYpBUPS5jqbkBr6093M7Epksi86oRjtbcXAT0qwIDAQABo20w -azApBgNVHREEIjAggg1lbGFzdGljc2VhcmNogglsb2NhbGhvc3SHBH8AAAEwHQYD -VR0OBBYEFC/cKMOAVbx8bwyoKdg2Oiej9xoSMB8GA1UdIwQYMBaAFBIAjWDf6ACx -PkEdV9pY+U0XL0iCMA0GCSqGSIb3DQEBCwUAA4IBAQBo42FOuxIMeIiMaKa347gc -WsHpkazYOA6iHK5xXPsVUU1xSCLKp5HLCC04FU5P9njCDyZo1e/SR6rirQJJHEtT -SAn7iabREE+vy0oN3JnyV+eJPmKWxlqeFr9Cs9uIXQbgjwyyj9rxT06eLr3M1MA1 -IsARV2eyxcgS5sCC8JBCEpKR4jLRrpAs0tGJOeIh1cmf/1id+NQaDa14sLFKHBH1 -3+6TfBPrhJoGqFz92jV2airr7dppyCXgmWymVc66iD00Nak6Bvchg6ARTkqJnfoZ -2/Tz7asHV2V052ZLiow7Si34nS/9Hp8F8vUaj+FYXowvGwQUXLQIg/53KXh7piuW ------END CERTIFICATE----- diff --git a/deployment/opencdmp/backend/config/app.env b/deployment/opencdmp/backend/config/app.env index 36b16d6ae..ec8d5e82e 100644 --- a/deployment/opencdmp/backend/config/app.env +++ b/deployment/opencdmp/backend/config/app.env @@ -15,9 +15,6 @@ ELASTIC_DESCRIPTION_INDEX=opencdmp-descriptions-test #SERVER WEB_PORT=8081 -#GOTENBERG -PDF_CONVERTER_URL=http://opencdmp.gotenberg:3000/ - #STORAGE FILE_STORAGE=/storage @@ -31,7 +28,7 @@ RABBIT_PASS=guest KEYCLOAK_API_SERVER_URL=http://host.docker.internal:8081/keycloak KEYCLOAK_API_REALM=OpenCDMP KEYCLOAK_API_USERNAME=dmp-keycloak-api -KEYCLOAK_API_PASSWORD=dmp-api +KEYCLOAK_API_PASSWORD=admin KEYCLOAK_API_CLIENT_ID=dmp_web KEYCLOAK_API_CLIENT_SECRET=web_secret @@ -45,13 +42,4 @@ IDP_APIKEY_SCOPE=dmp_plugins #METRICS IDP_APIKEY_CLIENT_ID_UUID=c82150e9-a9e5-4a5f-bd0f-5f25460b3e08 -QUEUE_APP_ID=opencdmp-api-dev - -#EMAIL -MAIL_HOST=smtp.office365.com -MAIL_PORT=587 -MAIL_USERNAME= -MAIL_PASSWORD= -MAIL_AUTH=false -MAIL_TLS=true -MAIL_ADDRESS=dmp_web@admin.gr \ No newline at end of file +QUEUE_APP_ID=opencdmp-api-dev \ No newline at end of file diff --git a/deployment/opencdmp/backend/config/db-test.yml b/deployment/opencdmp/backend/config/db-test.yml index 2130e8d28..2a8ec03aa 100644 --- a/deployment/opencdmp/backend/config/db-test.yml +++ b/deployment/opencdmp/backend/config/db-test.yml @@ -1,14 +1,7 @@ spring: - jpa: - show-sql: true - properties: - hibernate: - format_sql: false datasource: maxIdle: 10 minIdle: 5 maxActive: 10 - url: ${DB_URL:} - username: ${DB_USER:} - password: ${DB_PASS:} + \ No newline at end of file diff --git a/deployment/opencdmp/backend/config/elasticsearch-test.yml b/deployment/opencdmp/backend/config/elasticsearch-test.yml deleted file mode 100644 index f5d517967..000000000 --- a/deployment/opencdmp/backend/config/elasticsearch-test.yml +++ /dev/null @@ -1,23 +0,0 @@ -elastic: - enabled: ${ELASTIC_ENABLED:} - disableHostnameVerifier: true - serverCertificatePaths: - - /certificates/elasticsearch_dev04.crt - hosts: - - ${ELASTIC_HOST:} - username: ${ELASTIC_USER:} - password: ${ELASTIC_PASS:} - useSSL: ${ELASTIC_USE_SSL:} - socketTimeoutMillis: 30000 - connectTimeoutMillis: 30000 - defaultResultSize: 100 - defaultCollectAllResultSize: 1000 - defaultScrollSize: 100 - defaultScrollSeconds: 120 - defaultCompositeAggregationResultSize: 200000 -app-elastic: - enableIcuAnalysisPlugin: true - enabled: ${ELASTIC_ENABLED:} - dmpIndexName: ${ELASTIC_DMP_INDEX:} - descriptionIndexName: ${ELASTIC_DESCRIPTION_INDEX:} - resetBatchSize: 1000 \ No newline at end of file diff --git a/deployment/opencdmp/backend/config/logging/logback-test.xml b/deployment/opencdmp/backend/config/logging/logback-test.xml index a90075d1e..078666222 100644 --- a/deployment/opencdmp/backend/config/logging/logback-test.xml +++ b/deployment/opencdmp/backend/config/logging/logback-test.xml @@ -34,34 +34,26 @@ - - - - - - - - diff --git a/deployment/opencdmp/backend/config/metrics-test.yml b/deployment/opencdmp/backend/config/metrics-test.yml index 7a3b0b44b..5f4202f5c 100644 --- a/deployment/opencdmp/backend/config/metrics-test.yml +++ b/deployment/opencdmp/backend/config/metrics-test.yml @@ -11,3 +11,7 @@ metrics: endpoints: prometheus: sensitive: false +management: + endpoints: + web: + base-path: /api \ No newline at end of file diff --git a/deployment/opencdmp/backend/config/security-test.yml b/deployment/opencdmp/backend/config/security-test.yml index 5776031be..01d464a3e 100644 --- a/deployment/opencdmp/backend/config/security-test.yml +++ b/deployment/opencdmp/backend/config/security-test.yml @@ -1,15 +1,8 @@ web: security: - enabled: true - authorized-endpoints: [ api ] - allowed-endpoints: [ api/public, api/dmp/public, api/description/public, /api/supportive-material/public, api/language/public, api/contact-support/public, api/dashboard/public, prometheus, health, metrics ] + allowed-endpoints: [ api/public, api/dmp/public, api/description/public, /api/supportive-material/public, api/language/public, api/contact-support/public, api/dashboard/public, api/prometheus, api/health, api/metrics ] idp: - api-key: - enabled: false resource: - token-type: JWT #| opaque jwt: claims: [ role, x-role ] - issuer-uri: ${IDP_ISSUER_URI:} - audiences: [ "dmp_web" ] - validIssuer: ${IDP_ISSUER_URI:} \ No newline at end of file + audiences: [ "dmp_web" ] \ No newline at end of file diff --git a/deployment/opencdmp/file-transformer-docx/config/logging/logback-test.xml b/deployment/opencdmp/file-transformer-docx/config/logging/logback-test.xml index a90075d1e..3b02a88ad 100644 --- a/deployment/opencdmp/file-transformer-docx/config/logging/logback-test.xml +++ b/deployment/opencdmp/file-transformer-docx/config/logging/logback-test.xml @@ -34,34 +34,23 @@ - - - - - - - - - - - diff --git a/deployment/opencdmp/file-transformer-docx/config/pdf-test.yml b/deployment/opencdmp/file-transformer-docx/config/pdf-test.yml deleted file mode 100644 index fbf24008d..000000000 --- a/deployment/opencdmp/file-transformer-docx/config/pdf-test.yml +++ /dev/null @@ -1,3 +0,0 @@ -pdf: - converter: - url: ${PDF_CONVERTER_URL} \ No newline at end of file diff --git a/deployment/opencdmp/file-transformer-docx/config/storage-test.yml b/deployment/opencdmp/file-transformer-docx/config/storage-test.yml deleted file mode 100644 index 283aecd1e..000000000 --- a/deployment/opencdmp/file-transformer-docx/config/storage-test.yml +++ /dev/null @@ -1,4 +0,0 @@ -file: - storage: - temp: ${STORAGE_PATH}/tmp - transient-path: ${STORAGE_PATH}/shared \ No newline at end of file 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 index a90075d1e..b6303075d 100644 --- a/deployment/opencdmp/file-transformer-rda-json/config/logging/logback-test.xml +++ b/deployment/opencdmp/file-transformer-rda-json/config/logging/logback-test.xml @@ -37,31 +37,21 @@ - - - - - - - - - - diff --git a/deployment/opencdmp/file-transformer-rda-json/config/storage-test.yml b/deployment/opencdmp/file-transformer-rda-json/config/storage-test.yml deleted file mode 100644 index 283aecd1e..000000000 --- a/deployment/opencdmp/file-transformer-rda-json/config/storage-test.yml +++ /dev/null @@ -1,4 +0,0 @@ -file: - storage: - temp: ${STORAGE_PATH}/tmp - transient-path: ${STORAGE_PATH}/shared \ No newline at end of file diff --git a/deployment/opencdmp/frontend/config.json b/deployment/opencdmp/frontend/config.json index 3817e62c4..3cdd73814 100644 --- a/deployment/opencdmp/frontend/config.json +++ b/deployment/opencdmp/frontend/config.json @@ -64,5 +64,10 @@ "cultures": ["en"] } ] + }, + "referenceTypes": { + "researcherId": "5a2112e7-ea99-4cfe-98a1-68665e26726e", + "grantId": "5b9c284f-f041-4995-96cc-fad7ad13289c", + "organizationId": "7eeffb98-58fb-4921-82ec-e27f32f8e738" } } diff --git a/deployment/opencdmp/notification/config/app.env b/deployment/opencdmp/notification/config/app.env index b7b7489f0..2de992878 100644 --- a/deployment/opencdmp/notification/config/app.env +++ b/deployment/opencdmp/notification/config/app.env @@ -7,13 +7,6 @@ DB_PASSWORD=postgres-admin WEB_PORT=8080 #Security -IDP_APIKEY_CLIENT_ID=dmp_notification -IDP_APIKEY_CLIENT_SECRET=notification_secret -IDP_APIKEY_SCOPE=dmp_notification-dedicated - -IDP_OPAQUE_CLIENT_ID= -IDP_OPAQUE_CLIENT_SECRET= - IDP_ISSUER_URI=http://host.docker.internal:8081/keycloak/realms/OpenCDMP #RABBITMQ @@ -23,19 +16,13 @@ RABBIT_USER=guest RABBIT_PASS=guest #EMAIL -MAIL_HOST=smtp.office365.com -MAIL_PORT=587 +MAIL_HOST= +MAIL_PORT= MAIL_USERNAME= MAIL_PASSWORD= -MAIL_AUTH=false -MAIL_TLS=true +MAIL_AUTH= +MAIL_TLS= MAIL_ADDRESS=dmp_notification@admin.gr -#CIPHER -CIPHER_SYMETRIC_ENCRYPTION_CONFIGURATION_AES_KEY= -CIPHER_SYMETRIC_ENCRYPTION_CONFIGURATION_AES_IV= -CIPHER_SYMETRIC_ENCRYPTION_QUEUE_AES_KEY= -CIPHER_SYMETRIC_ENCRYPTION_QUEUE_AES_IV= - #NOTIFICATION -#CACHE_DISAMBIGUATION= \ No newline at end of file +CACHE_DISAMBIGUATION=ntf \ No newline at end of file diff --git a/deployment/opencdmp/notification/config/cipher-test.yml b/deployment/opencdmp/notification/config/cipher-test.yml deleted file mode 100644 index dcf9d5b5a..000000000 --- a/deployment/opencdmp/notification/config/cipher-test.yml +++ /dev/null @@ -1,12 +0,0 @@ -cipher: - symetric-encryption: - default-o: null - options: - configuration: - aes: - key: ${CIPHER_SYMETRIC_ENCRYPTION_CONFIGURATION_AES_KEY:} - iv: ${CIPHER_SYMETRIC_ENCRYPTION_CONFIGURATION_AES_IV:} - queue: - aes: - key: ${CIPHER_SYMETRIC_ENCRYPTION_QUEUE_AES_KEY:} - iv: ${CIPHER_SYMETRIC_ENCRYPTION_QUEUE_AES_IV:} \ No newline at end of file diff --git a/deployment/opencdmp/notification/config/db-test.yml b/deployment/opencdmp/notification/config/db-test.yml index eb529f7e1..c5d78eea6 100644 --- a/deployment/opencdmp/notification/config/db-test.yml +++ b/deployment/opencdmp/notification/config/db-test.yml @@ -1,18 +1,5 @@ spring: - jpa: - show-sql: true - properties: - hibernate: - show_sql: true - format_sql: false datasource: - url: ${DB_CONNECTION_STRING} - username: ${DB_USER} - password: ${DB_PASSWORD} - driver-class-name: org.postgresql.Driver - hikari: - connection-timeout: 30000 - minimum-idle: 3 - maximum-pool-size: 5 - idle-timeout: 600000 - max-lifetime: 1800000 + maxIdle: 10 + minIdle: 5 + maxActive: 10 \ No newline at end of file diff --git a/deployment/opencdmp/notification/config/email-test.yml b/deployment/opencdmp/notification/config/email-test.yml deleted file mode 100644 index fb7c94ba0..000000000 --- a/deployment/opencdmp/notification/config/email-test.yml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - mail: - host: ${MAIL_HOST:} - port: ${MAIL_PORT:} - username: ${MAIL_USERNAME:} - password: ${MAIL_PASSWORD:} - properties: - mail: - smtp: - auth: ${MAIL_AUTH:} - starttls: - enable: ${MAIL_TLS:} -email: - address: ${MAIL_ADDRESS:} \ No newline at end of file diff --git a/deployment/opencdmp/notification/config/logging/logback-test.xml b/deployment/opencdmp/notification/config/logging/logback-test.xml index c1392fea0..70770b39f 100644 --- a/deployment/opencdmp/notification/config/logging/logback-test.xml +++ b/deployment/opencdmp/notification/config/logging/logback-test.xml @@ -36,26 +36,17 @@ - - - - - - - - - diff --git a/deployment/opencdmp/notification/config/notification-test.yml b/deployment/opencdmp/notification/config/notification-test.yml index 3e530cc4b..8d90bc422 100644 --- a/deployment/opencdmp/notification/config/notification-test.yml +++ b/deployment/opencdmp/notification/config/notification-test.yml @@ -486,5 +486,5 @@ notification: priority-key: null cipher-fields: [ ] template-cache: - prefix: ${CACHE_DISAMBIGUATION:} + prefix: ${CACHE_DISAMBIGUATION} key-pattern: "{prefix}:Notification_Message_InApp_Template:{key}:v0" \ No newline at end of file diff --git a/deployment/opencdmp/notification/config/queue-test.yml b/deployment/opencdmp/notification/config/queue-test.yml index c00c16ee5..8390112b1 100644 --- a/deployment/opencdmp/notification/config/queue-test.yml +++ b/deployment/opencdmp/notification/config/queue-test.yml @@ -1,9 +1,5 @@ queue: rabbitmq: - host: ${RABBIT_HOST} - port: ${RABBIT_PORT} - username: ${RABBIT_USER} - password: ${RABBIT_PASS} enable: true durable: true queue: cite_dmp_test_notification_inbox_queue diff --git a/deployment/opencdmp/notification/config/security-test.yml b/deployment/opencdmp/notification/config/security-test.yml index 47f041369..6e0c8e4b7 100644 --- a/deployment/opencdmp/notification/config/security-test.yml +++ b/deployment/opencdmp/notification/config/security-test.yml @@ -1,21 +1,7 @@ web: security: - enabled: true - authorized-endpoints: [ api ] - allowed-endpoints: [ health ] idp: - api-key: - enabled: true - authorization-header: Authorization - client-id: ${IDP_APIKEY_CLIENT_ID:} - client-secret: ${IDP_APIKEY_CLIENT_SECRET:} - scope: ${IDP_APIKEY_SCOPE:} resource: - token-type: JWT #| opaque - opaque: - client-id: ${IDP_OPAQUE_CLIENT_ID:} - client-secret: ${IDP_OPAQUE_CLIENT_SECRET:} jwt: claims: [ role, x-role ] - issuer-uri: ${IDP_ISSUER_URI:} audiences: [ "dmp_notification" ] \ No newline at end of file diff --git a/deployment/opencdmp/notification/config/server-test.yml b/deployment/opencdmp/notification/config/server-test.yml index 4974bc055..2a628f82f 100644 --- a/deployment/opencdmp/notification/config/server-test.yml +++ b/deployment/opencdmp/notification/config/server-test.yml @@ -1,3 +1,2 @@ server: - port: ${WEB_PORT} forward-headers-strategy: FRAMEWORK \ No newline at end of file diff --git a/deployment/opencdmp/notification/config/tenant-test.yml b/deployment/opencdmp/notification/config/tenant-test.yml index 9f42782a8..17a26e7ca 100644 --- a/deployment/opencdmp/notification/config/tenant-test.yml +++ b/deployment/opencdmp/notification/config/tenant-test.yml @@ -6,5 +6,4 @@ tenant: default-tenant-code: default interceptor: client-claims-prefix: client_ - enforce-trusted-tenant: false - auto-create-tenant-user: true \ No newline at end of file + enforce-trusted-tenant: false \ No newline at end of file diff --git a/deployment/opencdmp/zenodo/config/logging/logback-test.xml b/deployment/opencdmp/zenodo/config/logging/logback-test.xml index a90075d1e..3b02a88ad 100644 --- a/deployment/opencdmp/zenodo/config/logging/logback-test.xml +++ b/deployment/opencdmp/zenodo/config/logging/logback-test.xml @@ -34,34 +34,23 @@ - - - - - - - - - - - diff --git a/deployment/opencdmp/zenodo/config/security-test.yml b/deployment/opencdmp/zenodo/config/security-test.yml index bb217b74f..65f6f3614 100644 --- a/deployment/opencdmp/zenodo/config/security-test.yml +++ b/deployment/opencdmp/zenodo/config/security-test.yml @@ -4,6 +4,4 @@ web: resource: jwt: claims: [ role, x-role ] - issuer-uri: ${IDP_ISSUER_URI} - validIssuer: ${IDP_ISSUER_URI} audiences: [ "dmp_plugins" ] \ No newline at end of file diff --git a/deployment/opencdmp/zenodo/config/server-test.yml b/deployment/opencdmp/zenodo/config/server-test.yml index 90a42d4bd..e8c53730c 100644 --- a/deployment/opencdmp/zenodo/config/server-test.yml +++ b/deployment/opencdmp/zenodo/config/server-test.yml @@ -1,4 +1,2 @@ server: - max-http-request-header-size: 16KB - port: ${WEB_PORT} - # forward-headers-strategy: FRAMEWORK \ No newline at end of file + max-http-request-header-size: 16KB \ No newline at end of file diff --git a/deployment/opencdmp/zenodo/config/storage-test.yml b/deployment/opencdmp/zenodo/config/storage-test.yml deleted file mode 100644 index 283aecd1e..000000000 --- a/deployment/opencdmp/zenodo/config/storage-test.yml +++ /dev/null @@ -1,4 +0,0 @@ -file: - storage: - temp: ${STORAGE_PATH}/tmp - transient-path: ${STORAGE_PATH}/shared \ No newline at end of file