Merge pull request #30 from aodn/features/5262-fix-template

demise protocol variable in favor of host
aodn · Mar 4, 2024 · 588f497 · 588f497
2 parents da70365 + 6237a02
commit 588f497
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 313 deletions.
diff --git a/docker-gn-compose.yml b/docker-gn-compose.yml
@@ -52,7 +52,7 @@ services:
 
       KB_URL: ${KB_URL:-http://localhost:5601}
 
-      INDEXER_HOST: ${INDEXER_HOST:-localhost}
+      INDEXER_HOST: ${INDEXER_HOST:-http://localhost}
       INDEXER_PORT: ${INDEXER_PORT:-8080}
       INDEXER_APIKEY: ${INDEXER_APIKEY}
 

diff --git a/geonetwork/src/main/resources/application.properties b/geonetwork/src/main/resources/application.properties
@@ -1,5 +1,4 @@
-aodn.geonetwork4.esIndexer.protocol=http
-aodn.geonetwork4.esIndexer.host=${INDEXER_HOST:localhost}
+aodn.geonetwork4.esIndexer.host=${INDEXER_HOST:http://localhost}
 aodn.geonetwork4.esIndexer.port=${INDEXER_PORT:80}
 aodn.geonetwork4.esIndexer.apikey=${INDEXER_APIKEY}
-aodn.geonetwork4.esIndexer.urlIndex=${aodn.geonetwork4.esIndexer.protocol}://${aodn.geonetwork4.esIndexer.host}:${aodn.geonetwork4.esIndexer.port}/api/v1/indexer/index/{uuid}
+aodn.geonetwork4.esIndexer.urlIndex=${aodn.geonetwork4.esIndexer.host}:${aodn.geonetwork4.esIndexer.port}/api/v1/indexer/index/{uuid}
diff --git a/geonetwork/src/main/resources/converter/replace.xsl b/geonetwork/src/main/resources/converter/replace.xsl
diff --git a/geonetwork/src/main/resources/converter/transform_19115_3_testing_urls.xsl b/geonetwork/src/main/resources/converter/transform_19115_3_testing_urls.xsl
diff --git a/geonetwork/src/main/resources/converter/transform_sandbox_urls.xsl b/geonetwork/src/main/resources/converter/transform_sandbox_urls.xsl
diff --git a/geonetwork/src/main/resources/converter/transform_testing_urls.xsl b/geonetwork/src/main/resources/converter/transform_testing_urls.xsl
diff --git a/geonetwork/src/main/resources/schema_plugins/converter/modify-urls.xsl b/geonetwork/src/main/resources/schema_plugins/converter/modify-urls.xsl
diff --git a/...src/main/resources/converter/template.png → ...ces/schema_plugins/converter/template.png b/...src/main/resources/converter/template.png → ...ces/schema_plugins/converter/template.png