MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development

This commit is contained in:
Diamantis Tziotzios 2019-09-05 13:30:56 +03:00
parent 21c4de8f21 da374f3f8e
commit 676cf654e7
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dmp-backend/web/src/main/resources/application-production.properties
View File

@ -17,8 +17,14 @@ pdf.converter.url=http://docsbox-web/
####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## ####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS##########
configuration.externalUrls=/tmp/ExternalUrls.xml configuration.externalUrls=/tmp/ExternalUrls.xml
configuration.dynamicGrantUrl=/tmp/GrantConfiguration.xml
configuration.dynamicProjectUrl=/tmp/ProjectConfiguration.xml configuration.dynamicProjectUrl=/tmp/ProjectConfiguration.xml
configuration.dynamicFunderUrl=/tmp/FunderConfiguration.xml
configuration.h2020template=/tmp/h2020.docx configuration.h2020template=/tmp/h2020.docx
configuration.resources.path=/tmp
####################MOCK FILES CONFIGURATIONS##########
dataset.tags.mock=/mockupTags.json
####################SPRING MAIL CONFIGURATIONS################# ####################SPRING MAIL CONFIGURATIONS#################
spring.mail.default-encoding=UTF-8 spring.mail.default-encoding=UTF-8
@ -81,3 +87,6 @@ conf_email.subject=OpenDMP email confirmation
#############ZENODO CONFIGURATIONS######### #############ZENODO CONFIGURATIONS#########
zenodo.url=https://sandbox.zenodo.org/api/ zenodo.url=https://sandbox.zenodo.org/api/
zenodo.access_token= zenodo.access_token=
#############CONTACT EMAIL CONFIGURATIONS#########
contact_email.mail=

15
dmp-backend/web/src/main/resources/application-staging.properties
View File

@ -17,8 +17,14 @@ pdf.converter.url=http://docsbox-web/
####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## ####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS##########
configuration.externalUrls=/tmp/ExternalUrls.xml configuration.externalUrls=/tmp/ExternalUrls.xml
configuration.dynamicGrantUrl=/tmp/GrantConfiguration.xml
configuration.dynamicProjectUrl=/tmp/ProjectConfiguration.xml configuration.dynamicProjectUrl=/tmp/ProjectConfiguration.xml
configuration.dynamicFunderUrl=/tmp/FunderConfiguration.xml
configuration.h2020template=/tmp/h2020.docx configuration.h2020template=/tmp/h2020.docx
configuration.resources.path=/tmp
####################MOCK FILES CONFIGURATIONS##########
dataset.tags.mock=/mockupTags.json
####################SPRING MAIL CONFIGURATIONS################# ####################SPRING MAIL CONFIGURATIONS#################
spring.mail.default-encoding=UTF-8 spring.mail.default-encoding=UTF-8
@ -54,7 +60,7 @@ conf_email.subject=OpenDMP email confirmation
b2access.externallogin.user_info_url=https://b2access-integration.fz-juelich.de:443/oauth2/userinfo 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.access_token_url=https://b2access-integration.fz-juelich.de:443/oauth2/token
b2access.externallogin.redirect_uri=https://devel.opendmp.eu/api/oauth/authorized/b2access b2access.externallogin.redirect_uri=https://devel.opendmp.eu/api/oauth/authorized/b2access
b2access.externallogin.clientid=eudatdmptool b2access.externallogin.clientid=
b2access.externallogin.clientSecret= b2access.externallogin.clientSecret=
#############ORCID CONFIGURATIONS######### #############ORCID CONFIGURATIONS#########
@ -62,3 +68,10 @@ orcid.login.client_id=
orcid.login.client_secret= orcid.login.client_secret=
orcid.login.access_token_url=https://orcid.org/oauth/token orcid.login.access_token_url=https://orcid.org/oauth/token
orcid.login.redirect_uri=https://opendmp.eu/login/external/orcid orcid.login.redirect_uri=https://opendmp.eu/login/external/orcid
#############ZENODO CONFIGURATIONS#########
zenodo.url=https://sandbox.zenodo.org/api/
zenodo.access_token=
#############CONTACT EMAIL CONFIGURATIONS#########
contact_email.mail=