Merge pull request #39 from aodn/bugs/5385-gateway-timeout

Bugs/5385 gateway timeout
aodn · May 14, 2024 · 9d12c41 · 9d12c41
2 parents 268be8a + d1badff
commit 9d12c41
Show file tree

Hide file tree

Showing 15 changed files with 370 additions and 204 deletions.
diff --git a/geonetwork-config/config.json b/geonetwork-config/config.json
@@ -250,5 +250,9 @@
   {
     "type": "harvesters",
     "jsonFileName": "imos-craig-catalogue.json"
+  },
+  {
+    "type": "settings",
+    "jsonFileName": "imos-{active_profile}.json"
   }
 ]
diff --git a/geonetwork-config/settings/imos-edge.json b/geonetwork-config/settings/imos-edge.json
@@ -0,0 +1,89 @@
+{
+  "comments": "Geonetwork4 edge max index thread 10, you can get details string via https://host/geonetwork/srv/api/site/settings/details",
+  "settings": {
+    "data": {
+      "system/platform/version": "4.4.1",
+      "system/platform/subVersion": "0",
+      "system/server/host": "localhost",
+      "system/server/protocol": "http",
+      "system/server/timeZone": "Australia/Hobart",
+      "system/userSelfRegistration/enable": false,
+      "system/localrating/enable": "advanced",
+      "system/localrating/notificationLevel": "catalogueAdministrator",
+      "system/localrating/notificationGroups": null,
+      "system/xlinkResolver/localXlinkEnable": true,
+      "system/xlinkResolver/ignore": "operatesOn,featureCatalogueCitation,Anchor,source,parentIdentifier",
+      "system/xlinkResolver/referencedDeletionAllowed": true,
+      "system/searchStats/enable": false,
+      "system/inspire/enable": false,
+      "system/harvester/enablePrivilegesManagement": false,
+      "system/harvester/disabledHarvesterTypes": null,
+      "system/users/identicon": "gravatar:mp",
+      "system/metadata/prefergrouplogo": true,
+      "system/metadata/allThesaurus": false,
+      "system/metadata/thesaurusNamespace": "https://registry.geonetwork-opensource.org/{{type}}/{{filename}}",
+      "metadata/vcs/enable": false,
+      "system/metadata/history/enabled": false,
+      "system/metadatacreate/generateUuid": true,
+      "system/metadatacreate/preferredGroup": null,
+      "system/metadatacreate/preferredTemplate": null,
+      "system/metadataprivs/publicationbyrevieweringroupowneronly": true,
+      "system/metadataprivs/publication/notificationLevel": null,
+      "system/metadataprivs/publication/notificationGroups": null,
+      "system/index/indexingTimeRecordLink": false,
+      "system/inspire/remotevalidation/url": null,
+      "system/inspire/remotevalidation/urlquery": null,
+      "system/inspire/remotevalidation/nodeid": null,
+      "region/getmap/background": "osm",
+      "region/getmap/width": "500",
+      "region/getmap/summaryWidth": "500",
+      "region/getmap/mapproj": "EPSG:3857",
+      "system/site/name": "AODN Geonetwork4 - Edge",
+      "metadata/resourceIdentifierPrefix": "http://localhost:8080/geonetwork/srv/resources",
+      "metadata/workflow/enable": false,
+      "metadata/workflow/allowSubmitApproveInvalidMd": true,
+      "metadata/workflow/allowPublishNonApprovedMd": true,
+      "metadata/workflow/allowPublishInvalidMd": true,
+      "metadata/workflow/automaticUnpublishInvalidMd": false,
+      "metadata/workflow/forceValidationOnMdSave": false,
+      "metadata/backuparchive/enable": false,
+      "metadata/link/excludedUrlPattern": null,
+      "metadata/import/userprofile": "Editor",
+      "metadata/batchediting/accesslevel": "Editor",
+      "metadata/delete/profilePublishedMetadata": "Editor",
+      "metadata/publication/profilePublishMetadata": "Reviewer",
+      "metadata/publication/profileUnpublishMetadata": "Reviewer",
+      "metadata/pdfReport/pdfName": "metadata_{datetime}.pdf",
+      "metadata/csvReport/csvName": "metadata_{datetime}.csv",
+      "system/ui/defaultView": "default",
+      "system/userSelfRegistration/recaptcha/enable": false,
+      "system/userSelfRegistration/recaptcha/publickey": null,
+      "system/publication/doi/doienabled": false,
+      "system/publication/doi/doiurl": null,
+      "system/publication/doi/doiusername": null,
+      "system/publication/doi/doikey": null,
+      "system/publication/doi/doilandingpagetemplate": "http://localhost:8080/geonetwork/srv/resources/records/{{uuid}}",
+      "system/publication/doi/doipublicurl": null,
+      "system/publication/doi/doipattern": "{{uuid}}",
+      "system/security/passwordEnforcement/minLength": 6,
+      "system/security/passwordEnforcement/maxLength": 20,
+      "system/security/passwordEnforcement/usePattern": true,
+      "system/security/passwordEnforcement/pattern": "^((?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*(_|[^\\w])).*)$",
+      "system/site/siteId": "b81d35c3-f06c-466a-85ac-2d447bfde82e",
+      "system/server/port": 80,
+      "system/metadata/validation/removeSchemaLocation": true,
+      "system/harvester/enableEditing": true,
+      "system/metadataprivs/usergrouponly": true,
+      "system/site/organization": "Australian Ocean Data Network",
+      "system/xlinkResolver/enable": true,
+      "metadata/workflow/draftWhenInGroup": ".*",
+      "system/feedback/mailServer/hostIsDefined": true,
+      "system/threadedindexing/maxthreads": 10,
+      "system/feedback/email": "[email protected]",
+      "system/feedback/mailServer/host": "postoffice.utas.edu.au",
+      "system/feedback/mailServer/port": 25,
+      "system/userFeedback/enable": true,
+      "system/server/log": "log4j2.xml"
+    }
+  }
+}
diff --git a/geonetwork-config/settings/imos-prod.json b/geonetwork-config/settings/imos-prod.json
@@ -0,0 +1,89 @@
+{
+  "comments": "Geonetwork4 edge max index thread 10, you can get details string via https://host/geonetwork/srv/api/site/settings/details",
+  "settings": {
+    "data": {
+      "system/platform/version": "4.4.1",
+      "system/platform/subVersion": "0",
+      "system/server/host": "localhost",
+      "system/server/protocol": "http",
+      "system/server/timeZone": "Australia/Hobart",
+      "system/userSelfRegistration/enable": false,
+      "system/localrating/enable": "advanced",
+      "system/localrating/notificationLevel": "catalogueAdministrator",
+      "system/localrating/notificationGroups": null,
+      "system/xlinkResolver/localXlinkEnable": true,
+      "system/xlinkResolver/ignore": "operatesOn,featureCatalogueCitation,Anchor,source,parentIdentifier",
+      "system/xlinkResolver/referencedDeletionAllowed": true,
+      "system/searchStats/enable": false,
+      "system/inspire/enable": false,
+      "system/harvester/enablePrivilegesManagement": false,
+      "system/harvester/disabledHarvesterTypes": null,
+      "system/users/identicon": "gravatar:mp",
+      "system/metadata/prefergrouplogo": true,
+      "system/metadata/allThesaurus": false,
+      "system/metadata/thesaurusNamespace": "https://registry.geonetwork-opensource.org/{{type}}/{{filename}}",
+      "metadata/vcs/enable": false,
+      "system/metadata/history/enabled": false,
+      "system/metadatacreate/generateUuid": true,
+      "system/metadatacreate/preferredGroup": null,
+      "system/metadatacreate/preferredTemplate": null,
+      "system/metadataprivs/publicationbyrevieweringroupowneronly": true,
+      "system/metadataprivs/publication/notificationLevel": null,
+      "system/metadataprivs/publication/notificationGroups": null,
+      "system/index/indexingTimeRecordLink": false,
+      "system/inspire/remotevalidation/url": null,
+      "system/inspire/remotevalidation/urlquery": null,
+      "system/inspire/remotevalidation/nodeid": null,
+      "region/getmap/background": "osm",
+      "region/getmap/width": "500",
+      "region/getmap/summaryWidth": "500",
+      "region/getmap/mapproj": "EPSG:3857",
+      "system/site/name": "AODN Geonetwork4 - Production",
+      "metadata/resourceIdentifierPrefix": "http://localhost:8080/geonetwork/srv/resources",
+      "metadata/workflow/enable": false,
+      "metadata/workflow/allowSubmitApproveInvalidMd": true,
+      "metadata/workflow/allowPublishNonApprovedMd": true,
+      "metadata/workflow/allowPublishInvalidMd": true,
+      "metadata/workflow/automaticUnpublishInvalidMd": false,
+      "metadata/workflow/forceValidationOnMdSave": false,
+      "metadata/backuparchive/enable": false,
+      "metadata/link/excludedUrlPattern": null,
+      "metadata/import/userprofile": "Editor",
+      "metadata/batchediting/accesslevel": "Editor",
+      "metadata/delete/profilePublishedMetadata": "Editor",
+      "metadata/publication/profilePublishMetadata": "Reviewer",
+      "metadata/publication/profileUnpublishMetadata": "Reviewer",
+      "metadata/pdfReport/pdfName": "metadata_{datetime}.pdf",
+      "metadata/csvReport/csvName": "metadata_{datetime}.csv",
+      "system/ui/defaultView": "default",
+      "system/userSelfRegistration/recaptcha/enable": false,
+      "system/userSelfRegistration/recaptcha/publickey": null,
+      "system/publication/doi/doienabled": false,
+      "system/publication/doi/doiurl": null,
+      "system/publication/doi/doiusername": null,
+      "system/publication/doi/doikey": null,
+      "system/publication/doi/doilandingpagetemplate": "http://localhost:8080/geonetwork/srv/resources/records/{{uuid}}",
+      "system/publication/doi/doipublicurl": null,
+      "system/publication/doi/doipattern": "{{uuid}}",
+      "system/security/passwordEnforcement/minLength": 6,
+      "system/security/passwordEnforcement/maxLength": 20,
+      "system/security/passwordEnforcement/usePattern": true,
+      "system/security/passwordEnforcement/pattern": "^((?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*(_|[^\\w])).*)$",
+      "system/site/siteId": "b81d35c3-f06c-466a-85ac-2d447bfde82e",
+      "system/server/port": 80,
+      "system/metadata/validation/removeSchemaLocation": true,
+      "system/harvester/enableEditing": true,
+      "system/metadataprivs/usergrouponly": true,
+      "system/site/organization": "Australian Ocean Data Network",
+      "system/xlinkResolver/enable": true,
+      "metadata/workflow/draftWhenInGroup": ".*",
+      "system/feedback/mailServer/hostIsDefined": true,
+      "system/threadedindexing/maxthreads": 10,
+      "system/feedback/email": "[email protected]",
+      "system/feedback/mailServer/host": "postoffice.utas.edu.au",
+      "system/feedback/mailServer/port": 25,
+      "system/userFeedback/enable": true,
+      "system/server/log": "log4j2.xml"
+    }
+  }
+}
diff --git a/geonetwork-config/settings/imos-staging.json b/geonetwork-config/settings/imos-staging.json
@@ -0,0 +1,89 @@
+{
+  "comments": "Geonetwork4 edge max index thread 10, you can get details string via https://host/geonetwork/srv/api/site/settings/details",
+  "settings": {
+    "data": {
+      "system/platform/version": "4.4.1",
+      "system/platform/subVersion": "0",
+      "system/server/host": "localhost",
+      "system/server/protocol": "http",
+      "system/server/timeZone": "Australia/Hobart",
+      "system/userSelfRegistration/enable": false,
+      "system/localrating/enable": "advanced",
+      "system/localrating/notificationLevel": "catalogueAdministrator",
+      "system/localrating/notificationGroups": null,
+      "system/xlinkResolver/localXlinkEnable": true,
+      "system/xlinkResolver/ignore": "operatesOn,featureCatalogueCitation,Anchor,source,parentIdentifier",
+      "system/xlinkResolver/referencedDeletionAllowed": true,
+      "system/searchStats/enable": false,
+      "system/inspire/enable": false,
+      "system/harvester/enablePrivilegesManagement": false,
+      "system/harvester/disabledHarvesterTypes": null,
+      "system/users/identicon": "gravatar:mp",
+      "system/metadata/prefergrouplogo": true,
+      "system/metadata/allThesaurus": false,
+      "system/metadata/thesaurusNamespace": "https://registry.geonetwork-opensource.org/{{type}}/{{filename}}",
+      "metadata/vcs/enable": false,
+      "system/metadata/history/enabled": false,
+      "system/metadatacreate/generateUuid": true,
+      "system/metadatacreate/preferredGroup": null,
+      "system/metadatacreate/preferredTemplate": null,
+      "system/metadataprivs/publicationbyrevieweringroupowneronly": true,
+      "system/metadataprivs/publication/notificationLevel": null,
+      "system/metadataprivs/publication/notificationGroups": null,
+      "system/index/indexingTimeRecordLink": false,
+      "system/inspire/remotevalidation/url": null,
+      "system/inspire/remotevalidation/urlquery": null,
+      "system/inspire/remotevalidation/nodeid": null,
+      "region/getmap/background": "osm",
+      "region/getmap/width": "500",
+      "region/getmap/summaryWidth": "500",
+      "region/getmap/mapproj": "EPSG:3857",
+      "system/site/name": "AODN Geonetwork4 - Staging",
+      "metadata/resourceIdentifierPrefix": "http://localhost:8080/geonetwork/srv/resources",
+      "metadata/workflow/enable": false,
+      "metadata/workflow/allowSubmitApproveInvalidMd": true,
+      "metadata/workflow/allowPublishNonApprovedMd": true,
+      "metadata/workflow/allowPublishInvalidMd": true,
+      "metadata/workflow/automaticUnpublishInvalidMd": false,
+      "metadata/workflow/forceValidationOnMdSave": false,
+      "metadata/backuparchive/enable": false,
+      "metadata/link/excludedUrlPattern": null,
+      "metadata/import/userprofile": "Editor",
+      "metadata/batchediting/accesslevel": "Editor",
+      "metadata/delete/profilePublishedMetadata": "Editor",
+      "metadata/publication/profilePublishMetadata": "Reviewer",
+      "metadata/publication/profileUnpublishMetadata": "Reviewer",
+      "metadata/pdfReport/pdfName": "metadata_{datetime}.pdf",
+      "metadata/csvReport/csvName": "metadata_{datetime}.csv",
+      "system/ui/defaultView": "default",
+      "system/userSelfRegistration/recaptcha/enable": false,
+      "system/userSelfRegistration/recaptcha/publickey": null,
+      "system/publication/doi/doienabled": false,
+      "system/publication/doi/doiurl": null,
+      "system/publication/doi/doiusername": null,
+      "system/publication/doi/doikey": null,
+      "system/publication/doi/doilandingpagetemplate": "http://localhost:8080/geonetwork/srv/resources/records/{{uuid}}",
+      "system/publication/doi/doipublicurl": null,
+      "system/publication/doi/doipattern": "{{uuid}}",
+      "system/security/passwordEnforcement/minLength": 6,
+      "system/security/passwordEnforcement/maxLength": 20,
+      "system/security/passwordEnforcement/usePattern": true,
+      "system/security/passwordEnforcement/pattern": "^((?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*(_|[^\\w])).*)$",
+      "system/site/siteId": "b81d35c3-f06c-466a-85ac-2d447bfde82e",
+      "system/server/port": 80,
+      "system/metadata/validation/removeSchemaLocation": true,
+      "system/harvester/enableEditing": true,
+      "system/metadataprivs/usergrouponly": true,
+      "system/site/organization": "Australian Ocean Data Network",
+      "system/xlinkResolver/enable": true,
+      "metadata/workflow/draftWhenInGroup": ".*",
+      "system/feedback/mailServer/hostIsDefined": true,
+      "system/threadedindexing/maxthreads": 10,
+      "system/feedback/email": "[email protected]",
+      "system/feedback/mailServer/host": "postoffice.utas.edu.au",
+      "system/feedback/mailServer/port": 25,
+      "system/userFeedback/enable": true,
+      "system/server/log": "log4j2.xml"
+    }
+  }
+}
diff --git a/geonetwork-config/settings/imos_po.json b/geonetwork-config/settings/imos_po.json
diff --git a/geonetwork-config/settings/imos_po_gn3-12.json b/geonetwork-config/settings/imos_po_gn3-12.json
diff --git a/geonetwork-config/settings/imos_sample.json b/geonetwork-config/settings/imos_sample.json