diff --git a/dmp-backend/web/src/main/resources/config/application-production.properties b/dmp-backend/web/src/main/resources/config/application-production.properties new file mode 100644 index 000000000..296798080 --- /dev/null +++ b/dmp-backend/web/src/main/resources/config/application-production.properties @@ -0,0 +1,101 @@ +dmp.domain = https://opendmp.eu + +####################PERSISTENCE OVERRIDES CONFIGURATIONS########## +database.url=jdbc:postgresql://dmp-db:5432/dmptool +database.username=dmptool +database.password=CHANGEME + +####################ELASTIIC SEARCH TAGS OVERRIDES CONFIGURATIONS########## +elasticsearch.host = tags-elastic-search +elasticsearch.port = 9200 +elasticsearch.username=elastic +elasticsearch.password= +elasticsearch.index=dmps + +####################PDF OVERRIDES CONFIGURATIONS########## +pdf.converter.url=http://docsbox-web/ + +####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## +configuration.externalUrls=externalUrls/ExternalUrls.xml +configuration.rda=RDACommonStandards.txt +configuration.h2020template=documents/h2020.docx +configuration.h2020datasettemplate=documents/h2020_dataset.docx +configuration.configurable_login_providers=ConfigurableLoginProviders.json +configuration.doi_funder=DOI_Funder.json + +####################SPRING MAIL CONFIGURATIONS################# +spring.mail.default-encoding=UTF-8 +spring.mail.host= +spring.mail.username= +spring.mail.password= +spring.mail.port=25 +spring.mail.protocol=smtp +spring.mail.test-connection=false +spring.mail.properties.mail.smtp.auth=false +spring.mail.properties.mail.smtp.starttls.enable=true + +#############FACEBOOK LOGIN CONFIGURATIONS######### +facebook.login.clientId= +facebook.login.clientSecret= +facebook.login.namespace=opendmp + +#############GOOGLE LOGIN CONFIGURATIONS######### +google.login.clientId= + +#############LINKEDIN LOGIN CONFIGURATIONS######### +linkedin.login.clientId= +linkedin.login.clientSecret= +linkedin.login.redirect_uri=https://opendmp.eu/login/linkedin +linkedin.login.user_info_url=https://api.linkedin.com/v2/me +linkedin.login.user_email=https://api.linkedin.com/v2/emailAddress?q=members&projection=(elements*(handle~)) +linkedin.login.access_token_url=https://www.linkedin.com/uas/oauth2/accessToken + +#############TWITTER LOGIN CONFIGURATIONS######### +twitter.login.clientId= +twitter.login.clientSecret= +twitter.login.redirect_uri=https://opendmp.eu/login/twitter + +#############B2 ACCESS CONFIGURATIONS######### +b2access.externallogin.user_info_url=https://b2access-integration.fz-juelich.de:443/oauth2/userinfo +b2access.externallogin.access_token_url=https://b2access-integration.fz-juelich.de:443/oauth2/token +b2access.externallogin.redirect_uri=https://opendmp.eu/api/oauth/authorized/b2access +b2access.externallogin.clientid= +b2access.externallogin.clientSecret= + +#############ORCID CONFIGURATIONS######### +orcid.login.client_id= +orcid.login.client_secret= +orcid.login.access_token_url=https://orcid.org/oauth/token +orcid.login.redirect_uri=https://opendmp.eu/login/external/orcid + +#############OPENAIRE CONFIGURATIONS######### +openaire.login.client_id= +openaire.login.client_secret= +openaire.login.access_token_url= +openaire.login.redirect_uri= +openaire.login.user_info_url= + +#############SPRING DATASOURCE CONFIGURATIONS######### +spring.datasource.maxIdle: 10 +spring.datasource.max-active: 70 +spring.datasource.max-wait: 10000 +spring.datasource.validationQuery: select 1 +spring.datasource.removeAbandoned: true +spring.datasource.removeAbandonedTimeout: 1 +spring.datasource.logAbandoned: true +spring.datasource.testOnBorrow: true +spring.datasource.testOnConnect: false +spring.datasource.testWhileIdle: false + +#############CONFIRMATION EMAIL CONFIGURATIONS######### +conf_email.expiration_time_seconds=14400 +conf_email.subject=OpenDMP email confirmation + +#############ZENODO CONFIGURATIONS######### +zenodo.url=https://zenodo.org/api/ +zenodo.access_token= + +#############CONTACT EMAIL CONFIGURATIONS######### +contact_email.mail= + +language.path=i18n/ \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/config/application.properties b/dmp-backend/web/src/main/resources/config/application.properties index d8b13c486..6829aed8a 100644 --- a/dmp-backend/web/src/main/resources/config/application.properties +++ b/dmp-backend/web/src/main/resources/config/application.properties @@ -6,18 +6,19 @@ spring.profiles.active=devel eu.eudat.logic.proxy.allowed.host=https://eestore.paas2.uninett.no ####################Metrics############## -management.endpoint.metrics.enabled=false -management.metrics.enable.http=false -management.metrics.enable.jvm=false -management.metrics.enable.jdbc=false -management.metrics.enable.tomcat=false -management.metrics.enable.logback=false -management.metrics.enable.hikaricp=false -management.metrics.enable.cache=false +management.endpoint.metrics.enabled=true +management.metrics.enable.http=true +management.metrics.enable.jvm=true +management.metrics.enable.jdbc=true +management.metrics.enable.tomcat=true +management.metrics.enable.logback=true +management.metrics.enable.hikaricp=true +management.metrics.enable.cache=true management.endpoints.web.base-path=/ -management.endpoints.web.exposure.include=prometheus +management.endpoints.web.exposure.include=prometheus,health,metrics management.endpoint.prometheus.enabled=true management.metrics.export.prometheus.enabled=true +management.endpoint.health.show-details=always ####################INVITATION MAIL CONFIGURATIONS############## ####################GENERIC MAIL CONFIGURATIONS################# diff --git a/dmp-backend/web/src/main/resources/logging/logback-production.xml b/dmp-backend/web/src/main/resources/logging/logback-production.xml new file mode 100644 index 000000000..cdac3ab14 --- /dev/null +++ b/dmp-backend/web/src/main/resources/logging/logback-production.xml @@ -0,0 +1,33 @@ + + + + + ${CONSOLE_LOG_PATTERN} + + + + + logs/openDMP.log + + logs/openDMP-%d{yyyy-MM-dd}.%i.log + + 100MB + + 30 + 3GB + + + ${FILE_LOG_PATTERN} + + + + + + + + + + + + + \ No newline at end of file diff --git a/dmp-frontend/src/assets/images/guide/2.3_account_user_menu.png b/dmp-frontend/src/assets/images/guide/2.3_account_user_menu.png new file mode 100644 index 000000000..65a311a83 Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/2.3_account_user_menu.png differ diff --git a/dmp-frontend/src/assets/images/guide/2.6_My_DMPs.png b/dmp-frontend/src/assets/images/guide/2.6_My_DMPs.png new file mode 100644 index 000000000..133d5af30 Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/2.6_My_DMPs.png differ diff --git a/dmp-frontend/src/assets/images/guide/2.6_My_Dataset_smaller_img_1.png b/dmp-frontend/src/assets/images/guide/2.6_My_Dataset_smaller_img_1.png new file mode 100644 index 000000000..883c8df25 Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/2.6_My_Dataset_smaller_img_1.png differ diff --git a/dmp-frontend/src/assets/images/guide/2.6_My_Datasets.png b/dmp-frontend/src/assets/images/guide/2.6_My_Datasets.png new file mode 100644 index 000000000..093c7729b Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/2.6_My_Datasets.png differ diff --git a/dmp-frontend/src/assets/images/guide/2.6_My_Datasets_smaller_img.png b/dmp-frontend/src/assets/images/guide/2.6_My_Datasets_smaller_img.png new file mode 100644 index 000000000..e40215fe4 Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/2.6_My_Datasets_smaller_img.png differ diff --git a/dmp-frontend/src/assets/images/guide/2.6_invite.png b/dmp-frontend/src/assets/images/guide/2.6_invite.png new file mode 100644 index 000000000..12e0438b8 Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/2.6_invite.png differ diff --git a/dmp-frontend/src/assets/images/guide/2.7_Public_Datasets_copy_dataset_to_DMP.png b/dmp-frontend/src/assets/images/guide/2.7_Public_Datasets_copy_dataset_to_DMP.png new file mode 100644 index 000000000..af9e9db56 Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/2.7_Public_Datasets_copy_dataset_to_DMP.png differ diff --git a/dmp-frontend/src/assets/images/guide/2.7_public_DMPs.png b/dmp-frontend/src/assets/images/guide/2.7_public_DMPs.png new file mode 100644 index 000000000..7eeaad2e1 Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/2.7_public_DMPs.png differ diff --git a/dmp-frontend/src/assets/images/guide/2.7_public_Dataset_descriptions.png b/dmp-frontend/src/assets/images/guide/2.7_public_Dataset_descriptions.png new file mode 100644 index 000000000..e442028ea Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/2.7_public_Dataset_descriptions.png differ diff --git a/dmp-frontend/src/assets/images/guide/2.8.1_Main_Info.jpg b/dmp-frontend/src/assets/images/guide/2.8.1_Main_Info.jpg deleted file mode 100644 index 8a589247d..000000000 Binary files a/dmp-frontend/src/assets/images/guide/2.8.1_Main_Info.jpg and /dev/null differ diff --git a/dmp-frontend/src/assets/images/guide/2.8.1_Main_Info.png b/dmp-frontend/src/assets/images/guide/2.8.1_Main_Info.png new file mode 100644 index 000000000..0a02e138a Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/2.8.1_Main_Info.png differ diff --git a/dmp-frontend/src/assets/images/guide/2.8.3_license_correct.png b/dmp-frontend/src/assets/images/guide/2.8.3_license_correct.png new file mode 100644 index 000000000..1c48194cc Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/2.8.3_license_correct.png differ diff --git a/dmp-frontend/src/assets/images/guide/2.8.5_Manually_or_Prefill.jpg b/dmp-frontend/src/assets/images/guide/2.8.5_Manually_or_Prefill.jpg deleted file mode 100644 index 0ad913347..000000000 Binary files a/dmp-frontend/src/assets/images/guide/2.8.5_Manually_or_Prefill.jpg and /dev/null differ diff --git a/dmp-frontend/src/assets/images/guide/2.8.5_Manually_or_Prefill.png b/dmp-frontend/src/assets/images/guide/2.8.5_Manually_or_Prefill.png new file mode 100644 index 000000000..51b876574 Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/2.8.5_Manually_or_Prefill.png differ diff --git a/dmp-frontend/src/assets/images/guide/From_Dataset_Editor_A_dataset_finalized.png b/dmp-frontend/src/assets/images/guide/From_Dataset_Editor_A_dataset_finalized.png new file mode 100644 index 000000000..5dec5771f Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/From_Dataset_Editor_A_dataset_finalized.png differ diff --git a/dmp-frontend/src/assets/images/guide/From_Dataset_Editor_A_dataset_unfinalized.png b/dmp-frontend/src/assets/images/guide/From_Dataset_Editor_A_dataset_unfinalized.png new file mode 100644 index 000000000..7512349a2 Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/From_Dataset_Editor_A_dataset_unfinalized.png differ diff --git a/dmp-frontend/src/assets/images/guide/From_My_DMPs.png b/dmp-frontend/src/assets/images/guide/From_My_DMPs.png new file mode 100644 index 000000000..2e0c260e0 Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/From_My_DMPs.png differ diff --git a/dmp-frontend/src/assets/images/guide/argos_first_import_or_start_wizard.png b/dmp-frontend/src/assets/images/guide/argos_first_import_or_start_wizard.png new file mode 100644 index 000000000..a5f733b39 Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/argos_first_import_or_start_wizard.png differ diff --git a/dmp-frontend/src/assets/images/guide/clone_DMP.png b/dmp-frontend/src/assets/images/guide/clone_DMP.png new file mode 100644 index 000000000..c32d29188 Binary files /dev/null and b/dmp-frontend/src/assets/images/guide/clone_DMP.png differ