From 35fbdcaddd4fb169ec5d592dda436aacf170d9c1 Mon Sep 17 00:00:00 2001 From: Jean-Michel Crepel Date: Mon, 9 Feb 2026 13:06:39 +0100 Subject: [PATCH 1/3] init script for datafeeder to avoid copy-datadir and envsubst --- datafeeder/scripts/init_datadir_docker_and_swarm.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 datafeeder/scripts/init_datadir_docker_and_swarm.sh diff --git a/datafeeder/scripts/init_datadir_docker_and_swarm.sh b/datafeeder/scripts/init_datadir_docker_and_swarm.sh new file mode 100755 index 00000000..93f3ba71 --- /dev/null +++ b/datafeeder/scripts/init_datadir_docker_and_swarm.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +# this is only required for datafeeder docker/docker swarm deploy +# this script file need the flag -Dgeorchestra.datadir=/tmp/georchestra in JAVA_OPTIONS +cp -r -f /etc/georchestra /tmp + +sed -e "s#\${FQDN}#${FQDN}#g" -i /tmp/georchestra/datafeeder/metadata_* + +echo "DONE" \ No newline at end of file From 5abad8fdc2fac822ef98591836ee85fb33f1a894 Mon Sep 17 00:00:00 2001 From: Jean-Michel Crepel Date: Mon, 9 Feb 2026 16:18:20 +0100 Subject: [PATCH 2/3] remove script and FQDN reference into metadata_templates --- datafeeder/metadata_template-19115-3.xml | 4 ++-- datafeeder/metadata_template.xml | 2 +- datafeeder/metadata_transform-19115-3.xsl | 4 ++-- datafeeder/metadata_transform.xsl | 2 +- datafeeder/scripts/init_datadir_docker_and_swarm.sh | 9 --------- 5 files changed, 6 insertions(+), 15 deletions(-) delete mode 100755 datafeeder/scripts/init_datadir_docker_and_swarm.sh diff --git a/datafeeder/metadata_template-19115-3.xml b/datafeeder/metadata_template-19115-3.xml index 17081309..01ce804d 100644 --- a/datafeeder/metadata_template-19115-3.xml +++ b/datafeeder/metadata_template-19115-3.xml @@ -200,7 +200,7 @@ - Catégories + Catégories @@ -215,7 +215,7 @@ - geonetwork.thesaurus.external.theme.thesaurus_mot_cle_thematique_categories + geonetwork.thesaurus.external.theme.thesaurus_mot_cle_thematique_categories diff --git a/datafeeder/metadata_template.xml b/datafeeder/metadata_template.xml index 68e01d14..0da27799 100644 --- a/datafeeder/metadata_template.xml +++ b/datafeeder/metadata_template.xml @@ -135,7 +135,7 @@ - geonetwork.thesaurus.external.theme.httpinspireeceuropaeutheme-theme + geonetwork.thesaurus.external.theme.httpinspireeceuropaeutheme-theme diff --git a/datafeeder/metadata_transform-19115-3.xsl b/datafeeder/metadata_transform-19115-3.xsl index 6110f99f..3784fc50 100644 --- a/datafeeder/metadata_transform-19115-3.xsl +++ b/datafeeder/metadata_transform-19115-3.xsl @@ -77,7 +77,7 @@ - Catégories + Catégories @@ -102,7 +102,7 @@ - geonetwork.thesaurus.external.theme.thesaurus_mot_cle_thematique_categories + geonetwork.thesaurus.external.theme.thesaurus_mot_cle_thematique_categories diff --git a/datafeeder/metadata_transform.xsl b/datafeeder/metadata_transform.xsl index 2240cc5d..2aac6854 100644 --- a/datafeeder/metadata_transform.xsl +++ b/datafeeder/metadata_transform.xsl @@ -91,7 +91,7 @@ - geonetwork.thesaurus.external.theme.httpinspireeceuropaeutheme-theme + geonetwork.thesaurus.external.theme.httpinspireeceuropaeutheme-theme diff --git a/datafeeder/scripts/init_datadir_docker_and_swarm.sh b/datafeeder/scripts/init_datadir_docker_and_swarm.sh deleted file mode 100755 index 93f3ba71..00000000 --- a/datafeeder/scripts/init_datadir_docker_and_swarm.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# this is only required for datafeeder docker/docker swarm deploy -# this script file need the flag -Dgeorchestra.datadir=/tmp/georchestra in JAVA_OPTIONS -cp -r -f /etc/georchestra /tmp - -sed -e "s#\${FQDN}#${FQDN}#g" -i /tmp/georchestra/datafeeder/metadata_* - -echo "DONE" \ No newline at end of file From f84b63197b3477a45688f66027284de56a48ae7a Mon Sep 17 00:00:00 2001 From: Jean-Michel Crepel Date: Mon, 9 Feb 2026 16:26:42 +0100 Subject: [PATCH 3/3] retreive consistence with master branche --- datafeeder/metadata_template-19115-3.xml | 4 ++-- datafeeder/metadata_template.xml | 2 +- datafeeder/metadata_transform-19115-3.xsl | 4 ++-- datafeeder/metadata_transform.xsl | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/datafeeder/metadata_template-19115-3.xml b/datafeeder/metadata_template-19115-3.xml index 01ce804d..c1258654 100644 --- a/datafeeder/metadata_template-19115-3.xml +++ b/datafeeder/metadata_template-19115-3.xml @@ -200,7 +200,7 @@ - Catégories + Catégories @@ -215,7 +215,7 @@ - geonetwork.thesaurus.external.theme.thesaurus_mot_cle_thematique_categories + geonetwork.thesaurus.external.theme.thesaurus_mot_cle_thematique_categories diff --git a/datafeeder/metadata_template.xml b/datafeeder/metadata_template.xml index 0da27799..3a7940de 100644 --- a/datafeeder/metadata_template.xml +++ b/datafeeder/metadata_template.xml @@ -135,7 +135,7 @@ - geonetwork.thesaurus.external.theme.httpinspireeceuropaeutheme-theme + geonetwork.thesaurus.external.theme.httpinspireeceuropaeutheme-theme diff --git a/datafeeder/metadata_transform-19115-3.xsl b/datafeeder/metadata_transform-19115-3.xsl index 3784fc50..78eb012c 100644 --- a/datafeeder/metadata_transform-19115-3.xsl +++ b/datafeeder/metadata_transform-19115-3.xsl @@ -77,7 +77,7 @@ - Catégories + Catégories @@ -102,7 +102,7 @@ - geonetwork.thesaurus.external.theme.thesaurus_mot_cle_thematique_categories + geonetwork.thesaurus.external.theme.thesaurus_mot_cle_thematique_categories diff --git a/datafeeder/metadata_transform.xsl b/datafeeder/metadata_transform.xsl index 2aac6854..c54edd14 100644 --- a/datafeeder/metadata_transform.xsl +++ b/datafeeder/metadata_transform.xsl @@ -91,7 +91,7 @@ - geonetwork.thesaurus.external.theme.httpinspireeceuropaeutheme-theme + geonetwork.thesaurus.external.theme.httpinspireeceuropaeutheme-theme