From 507f0f7fec079ff0dfc91385eb02dddad6a0bc11 Mon Sep 17 00:00:00 2001 From: Antonis Lempesis Date: Sun, 24 Oct 2021 22:20:14 +0000 Subject: [PATCH] converted properties to yaml --- src/main/resources/application.properties | 58 --------------------- src/main/resources/application.yml | 63 +++++++++++++++++++++++ 2 files changed, 63 insertions(+), 58 deletions(-) delete mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/application.yml diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index d150432..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,58 +0,0 @@ -# EMAIL SETTINGS -services.provide.mail.host = smtp.gmail.com -services.provide.mail.port = 465 -services.provide.mail.username = test.openaire@gmail.com -services.provide.mail.password = ^($*@$)*!$ -services.provide.mail.authenticate = true -services.provide.mail.debug = false -services.provide.mail.mode = ssl -services.provide.mail.from = test.openaire@gmail.com -services.provide.mail.replyTo = test.openaire@gmail.com - -# IS -services.provide.iSLookUpService.url = https://dev-openaire.d4science.org:443/is/services/isLookUp -services.provide.validatorService.url = http://88.197.53.69:8080/uoa-validator-service/services/validatorWebService - -#AAI-REDIS -services.provide.redis.host = localhost -services.provide.redis.port = 6379 -services.provide.redis.password = 2106875370 - -services.provide.db.driverClassName=org.postgresql.Driver -services.provide.db.url=jdbc:postgresql://localhost:5432/repomanager -services.provide.db.username=dnet -services.provide.db.password=dnetPwd - -services.provide.clients.search=https://beta.services.openaire.eu/search/v2/api -services.provide.clients.usagestats=https://services.openaire.eu/usagestats -services.provide.clients.usageEvents=http://beta.lbs.openaire.eu:8080/ajax/summary -services.provide.clients.dsm=http://beta.services.openaire.eu/openaire - -services.provide.baseUrl=https://beta.provide.openaire.eu/ -services.provide.usageStatisticsDiagramsBaseURL=https://beta.openaire.eu/stats3/ -services.provide.usageStatisticsNumbersBaseURL=https://beta.services.openaire.eu/usagestats/datasources/ -services.provide.usagestats.adminEmail=antleb@di.uoa.gr -services.provide.usagestats.sushiliteEndpoint=http://beta.services.openaire.eu/usagestats/sushilite/ -services.provide.analyticsURL=https://analytics.openaire.eu/addsite.php? - -services.provide.adminEmail=antleb@di.uoa.gr - -services.provide.validator.results.url=https://beta.provide.openaire.eu/compatibility/browseHistory/ -services.provide.topic_types.url=https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:topic_types.json -services.provide.broker.url=http://broker1-dev-dnet.d4science.org -services.provide.broker.port=8080 -services.provide.broker.api=api/ -services.provide.broker.openaire=openaireBroker - -services.provide.aai.baseURL=https://aai.openaire.eu -services.provide.aai.oidc.redirectURL = http://88.197.53.69/api/openid_connect_login -services.provide.aai.oidc.webURL = http://88.197.53.69/join -services.provide.aai.oidc.issuer=${services.provide.aai.baseURL}/oidc/ -services.provide.aai.oidc.id=767422b9-5461-4807-a80a-f9a2072d3a7d -services.provide.aai.oidc.secret=AMQtGlbTXNjwjhF0st28LmM6V0XypMdaVS7tJmGuYFlmH36iIv4t7tVqYuLYrNPkhnZ_GPUJvhymBhFupdgb6aU -services.provide.aai.oidc.domain=.openaire.eu -services.provide.aai.registry.url=${services.provide.aai.baseURL}/registry/ -services.provide.aai.registry.coid=2 -services.provide.aai.registry.production=false -services.provide.aai.registry.username=provide_openaire -services.provide.aai.registry.password=u8WfYv2R^f#y7G98 \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..0b20459 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,63 @@ +services: + provide: + aai: + baseURL: https://aai.openaire.eu + oidc: + domain: .openaire.eu + id: 767422b9-5461-4807-a80a-f9a2072d3a7d + issuer: ${services.provide.aai.baseURL}/oidc/ + redirectURL: http://88.197.53.69/api/openid_connect_login + secret: AMQtGlbTXNjwjhF0st28LmM6V0XypMdaVS7tJmGuYFlmH36iIv4t7tVqYuLYrNPkhnZ_GPUJvhymBhFupdgb6aU + webURL: http://88.197.53.69/join + registry: + coid: 2 + password: u8WfYv2R^f#y7G98 + production: false + url: ${services.provide.aai.baseURL}/registry/ + username: provide_openaire + adminEmail: antleb@di.uoa.gr + analyticsURL: https://analytics.openaire.eu/addsite.php? + baseUrl: https://beta.provide.openaire.eu/ + broker: + api: api/ + openaire: openaireBroker + port: 8080 + url: http://broker1-dev-dnet.d4science.org + clients: + dsm: http://beta.services.openaire.eu/openaire + search: https://beta.services.openaire.eu/search/v2/api + usageEvents: http://beta.lbs.openaire.eu:8080/ajax/summary + usagestats: https://services.openaire.eu/usagestats + db: + driverClassName: org.postgresql.Driver + password: dnetPwd + url: jdbc:postgresql://localhost:5432/repomanager + username: dnet + iSLookUpService: + url: https://dev-openaire.d4science.org:443/is/services/isLookUp + mail: + authenticate: true + debug: false + from: test.openaire@gmail.com + host: smtp.gmail.com + mode: ssl + password: ^($*@$)*!$ + port: 465 + replyTo: test.openaire@gmail.com + username: test.openaire@gmail.com + redis: + host: localhost + password: 2106875370 + port: 6379 + topic_types: + url: https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:topic_types.json + usageStatisticsDiagramsBaseURL: https://beta.openaire.eu/stats3/ + usageStatisticsNumbersBaseURL: https://beta.services.openaire.eu/usagestats/datasources/ + usagestats: + adminEmail: antleb@di.uoa.gr + sushiliteEndpoint: http://beta.services.openaire.eu/usagestats/sushilite/ + validator: + results: + url: https://beta.provide.openaire.eu/compatibility/browseHistory/ + validatorService: + url: http://88.197.53.69:8080/uoa-validator-service/services/validatorWebService