Allow to configure the Elasticsearch connection in environment variables

GeoCat · Jan 7, 2025 · 0119e1c · 0119e1c
1 parent 490e6b9
commit 0119e1c
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/web/src/main/webResources/WEB-INF/config.properties b/web/src/main/webResources/WEB-INF/config.properties
@@ -11,12 +11,12 @@ usersavedselection.watchlist.searchurl=catalog.search#/search?_uuid={{filter}}
 # Define the link to each record sent by email by the watchlist notifier
 usersavedselection.watchlist.recordurl=api/records/{{index:uuid}}
 
-es.protocol=${es.protocol}
-es.port=${es.port}
-es.host=${es.host}
-es.url=\${es.protocol}://\${es.host}:\${es.port}
-es.username=${es.username}
-es.password=${es.password}
+es.protocol=#{systemEnvironment['GEONETWORK_ES_PROTOCOL']?:'${es.protocol}'}
+es.port=#{systemEnvironment['GEONETWORK_ES_PORT']?:${es.port}}
+es.host=#{systemEnvironment['GEONETWORK_ES_HOST']?:'${es.host}'}
+es.url=#{systemEnvironment['GEONETWORK_ES_URL']?:'${es.url}'}
+es.username=#{systemEnvironment['GEONETWORK_ES_USERNAME']?:'${es.username}'}
+es.password=#{systemEnvironment['GEONETWORK_ES_PASSWORD']?:'${es.password}'}
 es.index.features=${es.index.features}
 es.index.features.type=${es.index.features.type}
 # Define the number of decimals to apply when converting geometries to GeoJSON
@@ -33,7 +33,7 @@ es.index.records_public=${es.index.records_public}
 es.index.searchlogs=${es.index.searchlogs}
 es.index.searchlogs.type=${es.index.searchlogs.type}
 
-kb.url=${kb.url}
+kb.url=#{systemEnvironment['GEONETWORK_KIBANA_URL']?:'${kb.url}'}
 
 es.index.checker.interval=0/5 * * * * ?