Update application.yml

src/main/resources/application.yml

@@ -14,10 +14,11 @@ spring:
         driverClassName: ${services.provide.db.driverClassName}
 
 services:
+    openaireServicesBaseUrl: https://beta.services.openaire.eu
     provide:
         dev-machine: 88.197.53.71   # VM-71
         aai:
-            baseURL: https://aai.openaire.eu
+            baseURL: https://beta.aai.openaire.eu
             oidc:
                 domain: .openaire.eu # use empty value for local, otherwise: ".openaire.eu"
                 id: XX
@@ -27,10 +28,10 @@ services:
                 webURL: http://localhost:4200/join
             registry:
                 coid: XX
+                username: XX
                 password: XX
                 production: false
                 url: ${services.provide.aai.baseURL}/registry/
-                username: provide_openaire
         adminEmail: XX
         analyticsURL: https://analytics.openaire.eu/addsite.php?
         baseUrl: https://dev-openaire.d4science.org/openaire
@@ -41,9 +42,9 @@ services:
             url: https://beta.broker.openaire.eu
         clients:
             dsm: https://dev-openaire.d4science.org/openaire
-            search: https://beta.services.openaire.eu/search/v2/api
+            search: ${services.openaireServicesBaseUrl}/search/v2/api
             usageEvents: http://beta.lbs.openaire.eu:8080/ajax/summary
-            usagestats: https://beta.services.openaire.eu/usagestats
+            usagestats: ${services.openaireServicesBaseUrl}/usagestats
         db:
             driverClassName: org.postgresql.Driver
             password: dnetPwd
@@ -66,12 +67,12 @@ services:
             password: XX
             port: 6379
         topic_types:
-            url: https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:topic_types.json
+            url: ${services.openaireServicesBaseUrl}/provision/mvc/vocabularies/dnet:topic_types.json
         usageStatisticsDiagramsBaseURL: https://beta.openaire.eu/stats3/
-        usageStatisticsNumbersBaseURL: https://beta.services.openaire.eu/usagestats/datasources/
+        usageStatisticsNumbersBaseURL: ${services.openaireServicesBaseUrl}/usagestats/datasources/
         usagestats:
             adminEmail: XX
-            sushiliteEndpoint: https://beta.services.openaire.eu/usagestats/sushilite/
+            sushiliteEndpoint: ${services.openaireServicesBaseUrl}/usagestats/sushilite/
         validator:
             results:
                 url: https://beta.provide.openaire.eu/compatibility/browseHistory/