MaDgIK
/
uoa-repository-manager-service
13
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge develop into master #6

Merged
lsmyrnaios merged 32 commits from develop into master 2023-11-02 14:05:15 +01:00
Conversation 0 Commits 32 Files Changed 35 +6 -5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 59fc344730 - Show all commits

11
src/main/resources/application.yml
View File

@ -14,11 +14,11 @@ spring:
driverClassName: ${services.provide.db.driverClassName}
services:
openaireServicesBaseUrl: https://beta.services.openaire.eu
openaireServicesBaseUrl: https://beta.services.openaire.eu # dev-openaire.d4science.org
provide:
dev-machine: 88.197.53.71 # VM-71
aai:
baseURL: https://beta.aai.openaire.eu
baseURL: https://aai.openaire.eu
oidc:
domain: .openaire.eu # use empty value for local, otherwise: ".openaire.eu"
id: XX
@ -34,14 +34,14 @@ services:
url: ${services.provide.aai.baseURL}/registry/
adminEmail: XX
analyticsURL: https://analytics.openaire.eu/addsite.php?
baseUrl: https://dev-openaire.d4science.org/openaire
baseUrl: ${services.openaireServicesBaseUrl}/openaire
broker:
api: api/
openaire: openaireBroker
port: 443
url: https://beta.broker.openaire.eu
clients:
dsm: https://dev-openaire.d4science.org/openaire
dsm: ${services.provide.baseUrl}
search: ${services.openaireServicesBaseUrl}/search/v2/api
usageEvents: http://beta.lbs.openaire.eu:8080/ajax/summary
usagestats: ${services.openaireServicesBaseUrl}/usagestats
@ -67,7 +67,8 @@ services:
password: XX
port: 6379
topic_types:
url: ${services.openaireServicesBaseUrl}/provision/mvc/vocabularies/dnet:topic_types.json
url: ${services.openaireServicesBaseUrl}/provision/mvc/vocabularies/dnet:topic_types.json # TODO - Check this! The requested json file does not exist in the DEV-url below)
# https://dev-openaire.d4science.org/provision/mvc/vocabularies/
usageStatisticsDiagramsBaseURL: https://beta.openaire.eu/stats3/
usageStatisticsNumbersBaseURL: ${services.openaireServicesBaseUrl}/usagestats/datasources/
usagestats: