diff --git a/dmp-backend/web/src/main/resources/config/application-devel.properties b/dmp-backend/web/src/main/resources/config/application-devel.properties deleted file mode 100644 index 90a3eb2d7..000000000 --- a/dmp-backend/web/src/main/resources/config/application-devel.properties +++ /dev/null @@ -1,105 +0,0 @@ -dmp.domain = http://localhost:4200 - -####################PERSISTENCE OVERRIDES CONFIGURATIONS########## -database.url= ${DB_URL:} -database.username= ${DB_USER:} -database.password= ${DB_PASS:} -spring.datasource.maxIdle=10 -spring.datasource.minIdle=5 -spring.datasource.maxActive=10 - -#####################AUDITING##################################### -audit.enable = false - -####################ELASTIIC SEARCH TAGS OVERRIDES CONFIGURATIONS########## -elasticsearch.host = localhost -elasticsearch.port = 9200 -elasticsearch.username=elastic -elasticsearch.password= ${ELASTIC_PASS:} -elasticsearch.index=dmps -elasticsearch.innerHitsSize=100 - -####################ELK OVERRIDES CONFIGURATIONS########## -http-logger.server-address = http://localhost:31311 - -####################PDF OVERRIDES CONFIGURATIONS########## -pdf.converter.url=http://localhost:3000/ - -####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## -configuration.externalUrls=externalUrls/ExternalUrls.xml -configuration.semantics=Semantics.json -configuration.h2020template=documents/h2020.docx -configuration.h2020datasettemplate=documents/h2020_dataset.docx -configuration.configurable_login_providers=configurableLoginProviders.json -configuration.pid_links=pidLinks.json - -####################EMAIL FILE TEMPLATES OVERRIDES CONFIGURATIONS########## -email.invite=classpath:templates/email/email.html -email.confirmation=classpath:templates/email/emailConfirmation.html -email.merge=classpath:templates/email/emailMergeConfirmation.html -email.unlink=classpath:templates/email/emailUnlinkConfirmation.html - -#############FACEBOOK LOGIN CONFIGURATIONS######### -facebook.login.clientId=${FACEBOOK_CLIENT_ID:} -facebook.login.clientSecret=${FACEBOOK_CLIENT_SECRET:} -facebook.login.namespace=${FACEBOOK_NAMESPACE:} - -#############GOOGLE LOGIN CONFIGURATIONS######### -google.login.clientId= ${GOOGLE_CLIENT_ID:} - -#############LINKEDIN LOGIN CONFIGURATIONS######### -linkedin.login.clientId=${LINKEDIN_CLIENT_ID:} -linkedin.login.clientSecret=${LINKEDIN_CLIENT_SECRET:} -linkedin.login.redirect_uri=http://localhost:4200/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.redirect_uri=http://localhost:4200/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=http://opendmp.eu/api/oauth/authorized/b2access -b2access.externallogin.clientid=${B2ACCESS_CLIENT_ID:} -b2access.externallogin.clientSecret=${B2ACCESS_CLIENT_SECRET:} - -#############ORCID CONFIGURATIONS######### -orcid.login.client_id=${ORCID_CLIENT_ID:} -orcid.login.client_secret=${ORCID_CLIENT_SECRET:} -orcid.login.access_token_url=https://orcid.org/oauth/token -orcid.login.redirect_uri=http://localhost:4200/login/external/orcid - -#############OPENAIRE CONFIGURATIONS######### -openaire.login.client_id=${OPENAIRE_CLIENT_ID:} -openaire.login.client_secret=${OPENAIRE_CLIENT_SECRET:} -openaire.login.access_token_url=${OPENAIRE_ACCESS_TOKEN_URL:} -openaire.login.redirect_uri=${OPENAIRE_REDIRECT_URI:} -openaire.login.user_info_url=${OPENAIRE_USER_INFO_URI:} - -#############CONFIRMATION EMAIL CONFIGURATIONS######### -conf_email.expiration_time_seconds=14400 -conf_email.subject=OpenDMP email confirmation - -#############ZENODO CONFIGURATIONS######### -zenodo.login.access_token_url=https://sandbox.zenodo.org/oauth/token -zenodo.login.client_id=${ZENODO_CLIENT_ID:} -zenodo.login.client_secret=${ZENODO_CLIENT_SECRET:} -zenodo.login.redirect_uri=http://localhost:4200/login/external/zenodo - -############PUBLIC API CONFIGUARION############### -publicapi.host=devel.opendmp.eu -publicapi.basePath=/srv -publicapi.schema=https - -#############CONTACT EMAIL CONFIGURATIONS######### -contact_email.mail=${CONTACT_EMAIL:} - -language.path=dmp-frontend/src/assets/i18n/ - -#############LOGGING######### -logging.config=classpath:logging/logback-${spring.profiles.active}.xml - -#############PROMETHEUS######### -endpoints.prometheus.sensitive: false \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/config/application-devel.yml b/dmp-backend/web/src/main/resources/config/application-devel.yml new file mode 100644 index 000000000..6f663646e --- /dev/null +++ b/dmp-backend/web/src/main/resources/config/application-devel.yml @@ -0,0 +1,20 @@ +spring: + datasource: + maxIdle: 10 + minIdle: 5 + maxActive: 10 + +audit: + enable: false + +email: + invite: classpath:templates/email/email.html + confirmation: classpath:templates/email/emailConfirmation.html + merge: classpath:templates/email/emailMergeConfirmation.html + unlink: classpath:templates/email/emailUnlinkConfirmation.html + dataset: + template: classpath:templates/email/emailAdmin.html + +endpoints: + prometheus: + sensitive: false \ 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 deleted file mode 100644 index 2ceb9e5ee..000000000 --- a/dmp-backend/web/src/main/resources/config/application.properties +++ /dev/null @@ -1,155 +0,0 @@ -server.port=8081 -server.tomcat.max-threads = 20 -server.tomcat.max-connections = 10000 -logging.file=/logs/spring-boot-logging.log -spring.profiles.active=devel -eu.eudat.logic.proxy.allowed.host=https://eestore.paas2.uninett.no - -####################Metrics############## -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,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################# -mail.subject=Invitation to DMP Plan {dmpname} -mail.from=opendmp-dev@cite.gr - -####################DATASET TEMPLATE MAIL CONFIGURATIONS################# -admin.mail.subject=You have been invited to the Dataset Template {templateName} - -####################SPRING MAIL CONFIGURATIONS################# -spring.mail.default-encoding=UTF-8 -spring.mail.host=hermes.local.cite.gr -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=false - -####################ELASTIIC SEARCH TAGS OVERRIDES CONFIGURATIONS########## -elasticsearch.host= -elasticsearch.port= -elasticsearch.username= -elasticsearch.password= -elasticsearch.index= -elasticsearch.usingssl=false -elasticsearch.certPath= -elasticsearch.certKey= -elasticsearch.innerHitsSize=100 - -####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## -configuration.externalUrls=externalUrls/ExternalUrls.xml -configuration.semantics=Semantics.json -configuration.h2020template=documents/h2020.docx -configuration.h2020datasettemplate=documents/h2020_dataset.docx -configuration.configurable_login_providers=configurableLoginProviders.json -configuration.pid_links=pidLinks.json - -####################EMAIL FILE TEMPLATES OVERRIDES CONFIGURATIONS########## -email.invite=file:templates/email/email.html -email.confirmation=file:templates/email/emailConfirmation.html -email.merge=file:templates/email/emailMergeConfirmation.html -email.unlink=classpath:templates/email/emailUnlinkConfirmation.html -email.dataset.template=file:templates/email/emailAdmin.html - -##################NOTIFICATION FILE TEMPLATES OVERRIDES CONFIGURATIONS########## -notification.finalised.template=classpath:templates/notifications/finalisedNotification.html -notification.modified_finalised.template=classpath:templates/notifications/modifiedFinalisedNotification.html -notification.modified.template=classpath:templates/notifications/modifiedNotification.html -notification.publish.template=classpath:templates/notifications/publishNotification.html - -#############LOGIN CONFIGURATIONS######### -#############GENERIC LOGIN CONFIGURATIONS######### -autouser.root.email= -autouser.root.password= -autouser.root.username= - -#############FACEBOOK LOGIN CONFIGURATIONS######### -facebook.login.clientId= -facebook.login.clientSecret= -facebook.login.namespace= - -#############GOOGLE LOGIN CONFIGURATIONS######### -google.login.clientId= - -#############LINKEDIN LOGIN CONFIGURATIONS######### -linkedin.login.clientId= -linkedin.login.clientSecret= -linkedin.login.redirect_uri=http://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=http://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=http://opendmp.eu/api/oauth/authorized/b2access -b2access.externallogin.clientid= -b2access.externallogin.clientSecret= - -#############DYNAMIC PROJECT CONFIGURATIONS######### -project.configuration.project.name = Project -project.configuration.funder.name = Funder -project.configuration.grant.name = Grant - -#############HTTP LOGGER DELAY CONFIGURATIONS######### -http-logger.initial-delay = 0 -http-logger.delay = 10 - -##########################PERISTENCE########################################## -#############GENERIC DATASOURCE CONFIGURATIONS######### -database.driver-class-name=org.postgresql.Driver -database.lock-fail-interval=120000 - -##########################MISC########################################## -#############USER GUIDE######### -userguide.path=dmp-backend/web/src/main/resources/material/user-guide - -#############ABOUT######### -about.path=dmp-backend/web/src/main/resources/material/about - -#############TERMS OF SERVICE######### -termsofservice.path=dmp-backend/web/src/main/resources/material/terms-of-service - -#############GLOSSARY######### -glossary.path=dmp-backend/web/src/main/resources/material/glossary - -#############FAQ######### -faq.path=dmp-backend/web/src/main/resources/material/faq - -#############NOTIFICATION######### -notification.rateInterval=30000 -notification.maxRetries=10 -notification.modified.subject=[OpenDMP] The {name} has been modified -notification.publish.subject=[OpenDMP] The {name} has been published -notification.finalised.subject=[OpenDMP] The {name} has been finalised -notification.modifiedFinalised.subject=[OpenDMP] The {name} has been modified and finalised - -#############LOGGING######### -logging.config=classpath:logging/logback-${spring.profiles.active}.xml - -#############TEMP######### -temp.temp=tmp/ -file.storage=uploads/ -spring.servlet.multipart.max-file-size=10MB -spring.servlet.multipart.max-request-size=10MB - -#############ZENODO######### -zenodo.affiliation=ARGOS -zenodo.community=argos \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/config/application.yml b/dmp-backend/web/src/main/resources/config/application.yml new file mode 100644 index 000000000..adaf0a0b4 --- /dev/null +++ b/dmp-backend/web/src/main/resources/config/application.yml @@ -0,0 +1,217 @@ +server: + port: 8081 + tomcat: + threads: + max: 20 + max-connections: 10000 + +management: + endpoint: + metrics: + enabled: true + prometheus: + enabled: true + health: + show-details: always + metrics: + enable: + http: true + jvm: true + jdbc: true + tomcat: true + logback: true + hikaricp: true + cache: true + export: + prometheus: + enabled: true + endpoints: + web: + base-path: / + exposure: + include: prometheus,health,metrics + +mail: + subject: "Invitation to DMP Plan {dmpname}" + from: opendmp-dev@cite.gr + +admin: + mail: + subject: "You have been invited to the Dataset Template {templateName}" + +spring: + servlet: + multipart: + max-file-size: 10MB + max-request-size: 10MB + mail: + default-encoding: UTF-8 + host: hermes.local.cite.gr + port: 25 + protocol: smtp + test-connection: false + properties: + mail: + smtp: + auth: false + starttls: + enable: false + +elasticsearch: + host: localhost + port: 9200 + username: elastic + password: ${ELASTIC_PASS:} + index: ${ELASTIC_INDEX:} + usingssl: false + certPath: ${ELASTIC_CERT_PATH:} + certKey: ${ELASTIC_CERT_KEY:} + innerHitsSize: 100 + +configuration: + externalUrls: externalUrls/ExternalUrls.xml + semantics: Semantics.json + h2020template: documents/h2020.docx + h2020datasettemplate: documents/h2020_dataset.docx + configurable_login_providers: configurableLoginProviders.json + pid_links: pidLinks.json + +email: + invite: file:templates/email/email.html + confirmation: file:templates/email/emailConfirmation.html + merge: file:templates/email/emailMergeConfirmation.html + unlink: classpath:templates/email/emailUnlinkConfirmation.html + dataset: + template: file:templates/email/emailAdmin.html + +notification: + finalised: + subject: "[OpenDMP] The {name} has been finalised" + template: classpath:templates/notifications/finalisedNotification.html + modified_finalised: + template: classpath:templates/notifications/modifiedFinalisedNotification.html + modified: + subject: "[OpenDMP] The {name} has been modified" + template: classpath:templates/notifications/modifiedNotification.html + publish: + subject: "[OpenDMP] The {name} has been published" + template: classpath:templates/notifications/publishNotification.html + rateInterval: 30000 + maxRetries: 10 + modifiedFinalised: + subject: "[OpenDMP] The {name} has been modified and finalised" + + +autouser: + root: + email: ${AUTOUSER_EMAIL:} + username: ${AUTOUSER_USER:} + password: ${AUTOUSER_PASS:} + +facebook: + login: + clientId: ${FACEBOOK_CLIENT_ID:} + clientSecret: ${FACEBOOK_CLIENT_SECRET:} + namespace: ${FACEBOOK_NAMESPACE:} + +google: + login: + clientId: ${GOOGLE_CLIENT_ID:} + +linkedin: + login: + clientId: ${LINKEDIN_CLIENT_ID:} + clientSecret: ${LINKEDIN_CLIENT_SECRET:} + redirect_uri: http://localhost:4200/login/linkedin + user_info_url: https://api.linkedin.com/v2/me + user_email: https://api.linkedin.com/v2/emailAddress?q=members&projection=(elements*(handle~)) + access_token_url: https://www.linkedin.com/uas/oauth2/accessToken + +twitter: + login: + clientId: ${TWITTER_CLIENT_ID:} + clientSecret: ${TWITTER_CLIENT_SECRET:} + redirect_uri: http://localhost:4200/login/twitter + +b2access: + externallogin: + user_info_url: https://b2access-integration.fz-juelich.de:443/oauth2/userinfo + access_token_url: https://b2access-integration.fz-juelich.de:443/oauth2/token + redirect_uri: http://opendmp.eu/api/oauth/authorized/b2access + clientid: ${B2ACCESS_CLIENT_ID:} + clientSecret: ${B2ACCESS_CLIENT_SECRET:} + +database: + driver-class-name: org.postgresql.Driver + lock-fail-interval: 120000 + url: ${DB_URL:} + username: ${DB_USER:} + password: ${DB_PASS:} + +userguide: + path: dmp-backend/web/src/main/resources/material/user-guide + +about: + path: dmp-backend/web/src/main/resources/material/about + +termsofservice: + path: dmp-backend/web/src/main/resources/material/terms-of-service + +glossary: + path: dmp-backend/web/src/main/resources/material/glossary + +faq: + path: dmp-backend/web/src/main/resources/material/faq + +logging: + config: classpath:logging/logback-${spring.profiles.active}.xml + +temp: + temp: ${TEMP_STORAGE:} + +file: + storage: ${FILE_STORAGE:} + + +zenodo: + affiliation: ARGOS + community: argos + login: + access_token_url: ${ZENODO_ACCESS_TOKEN_URL:} + client_id: ${ZENODO_CLIENT_ID:} + client_secret: ${ZENODO_CLIENT_SECRET:} + redirect_uri: http://localhost:4200/login/external/zenodo + +pdf: + converter: + url: ${PDF_CONVERTER_URL:} + +orcid: + login: + client_id: ${ORCID_CLIENT_ID:} + client_secret: ${ORCID_CLIENT_SECRET:} + access_token_url: https://orcid.org/oauth/token + redirect_uri: http://localhost:4200/login/external/orcid + +openaire: + login: + client_id: ${OPENAIRE_CLIENT_ID:} + client_secret: ${OPENAIRE_CLIENT_SECRET:} + access_token_url: ${OPENAIRE_ACCESS_TOKEN_URL:} + redirect_uri: ${OPENAIRE_REDIRECT_URI:} + user_info_url: ${OPENAIRE_USER_INFO_URI:} + +conf_email: + expiration_time_seconds: 14400 + subject: "OpenDMP email confirmation" + +publicapi: + host: devel.opendmp.eu + basePath: /srv + schema: https + +contact_email: + mail: ${CONTACT_EMAIL:} + +language: + path: dmp-frontend/src/assets/i18n/ \ No newline at end of file