diff --git a/deployment/elk/elasticsearch/elasticsearch.yml b/deployment/config-files/elk/elasticsearch/elasticsearch.yml similarity index 100% rename from deployment/elk/elasticsearch/elasticsearch.yml rename to deployment/config-files/elk/elasticsearch/elasticsearch.yml diff --git a/deployment/elk/elasticsearch/index_init.sh b/deployment/config-files/elk/elasticsearch/index_init.sh similarity index 100% rename from deployment/elk/elasticsearch/index_init.sh rename to deployment/config-files/elk/elasticsearch/index_init.sh diff --git a/deployment/elk/elasticsearch/log4j2.properties b/deployment/config-files/elk/elasticsearch/log4j2.properties similarity index 100% rename from deployment/elk/elasticsearch/log4j2.properties rename to deployment/config-files/elk/elasticsearch/log4j2.properties diff --git a/deployment/config-files/elk/elk.env b/deployment/config-files/elk/elk.env new file mode 100644 index 000000000..cff383119 --- /dev/null +++ b/deployment/config-files/elk/elk.env @@ -0,0 +1 @@ +ELASTIC_PASSWORD=elastic \ No newline at end of file diff --git a/deployment/keycloak/imports/opencdmp-realm.json b/deployment/config-files/keycloak/imports/opencdmp-realm.json similarity index 100% rename from deployment/keycloak/imports/opencdmp-realm.json rename to deployment/config-files/keycloak/imports/opencdmp-realm.json diff --git a/deployment/keycloak/imports/opencdmp-realm.jsonZone.Identifier b/deployment/config-files/keycloak/imports/opencdmp-realm.jsonZone.Identifier similarity index 100% rename from deployment/keycloak/imports/opencdmp-realm.jsonZone.Identifier rename to deployment/config-files/keycloak/imports/opencdmp-realm.jsonZone.Identifier diff --git a/deployment/keycloak/keycloak.env b/deployment/config-files/keycloak/keycloak.env similarity index 100% rename from deployment/keycloak/keycloak.env rename to deployment/config-files/keycloak/keycloak.env diff --git a/deployment/keycloak/user_init.sh b/deployment/config-files/keycloak/user_init.sh similarity index 100% rename from deployment/keycloak/user_init.sh rename to deployment/config-files/keycloak/user_init.sh diff --git a/deployment/opencdmp/annotation/config/app.env b/deployment/config-files/opencdmp/annotation/config/app.env similarity index 100% rename from deployment/opencdmp/annotation/config/app.env rename to deployment/config-files/opencdmp/annotation/config/app.env diff --git a/deployment/opencdmp/annotation/config/cors-test.yml b/deployment/config-files/opencdmp/annotation/config/cors-test.yml similarity index 100% rename from deployment/opencdmp/annotation/config/cors-test.yml rename to deployment/config-files/opencdmp/annotation/config/cors-test.yml diff --git a/deployment/opencdmp/annotation/config/db-test.yml b/deployment/config-files/opencdmp/annotation/config/db-test.yml similarity index 100% rename from deployment/opencdmp/annotation/config/db-test.yml rename to deployment/config-files/opencdmp/annotation/config/db-test.yml diff --git a/deployment/opencdmp/annotation/config/idpclaims-test.yml b/deployment/config-files/opencdmp/annotation/config/idpclaims-test.yml similarity index 100% rename from deployment/opencdmp/annotation/config/idpclaims-test.yml rename to deployment/config-files/opencdmp/annotation/config/idpclaims-test.yml diff --git a/deployment/opencdmp/annotation/config/logging-test.yml b/deployment/config-files/opencdmp/annotation/config/logging-test.yml similarity index 100% rename from deployment/opencdmp/annotation/config/logging-test.yml rename to deployment/config-files/opencdmp/annotation/config/logging-test.yml diff --git a/deployment/opencdmp/annotation/config/logging/logback-test.xml b/deployment/config-files/opencdmp/annotation/config/logging/logback-test.xml similarity index 100% rename from deployment/opencdmp/annotation/config/logging/logback-test.xml rename to deployment/config-files/opencdmp/annotation/config/logging/logback-test.xml diff --git a/deployment/opencdmp/annotation/config/permissions-test.yml b/deployment/config-files/opencdmp/annotation/config/permissions-test.yml similarity index 100% rename from deployment/opencdmp/annotation/config/permissions-test.yml rename to deployment/config-files/opencdmp/annotation/config/permissions-test.yml diff --git a/deployment/opencdmp/annotation/config/queue-test.yml b/deployment/config-files/opencdmp/annotation/config/queue-test.yml similarity index 100% rename from deployment/opencdmp/annotation/config/queue-test.yml rename to deployment/config-files/opencdmp/annotation/config/queue-test.yml diff --git a/deployment/opencdmp/annotation/config/security-test.yml b/deployment/config-files/opencdmp/annotation/config/security-test.yml similarity index 100% rename from deployment/opencdmp/annotation/config/security-test.yml rename to deployment/config-files/opencdmp/annotation/config/security-test.yml diff --git a/deployment/opencdmp/annotation/config/server-test.yml b/deployment/config-files/opencdmp/annotation/config/server-test.yml similarity index 100% rename from deployment/opencdmp/annotation/config/server-test.yml rename to deployment/config-files/opencdmp/annotation/config/server-test.yml diff --git a/deployment/opencdmp/annotation/config/tenant-test.yml b/deployment/config-files/opencdmp/annotation/config/tenant-test.yml similarity index 100% rename from deployment/opencdmp/annotation/config/tenant-test.yml rename to deployment/config-files/opencdmp/annotation/config/tenant-test.yml diff --git a/deployment/opencdmp/annotation/messages/messages.properties b/deployment/config-files/opencdmp/annotation/messages/messages.properties similarity index 100% rename from deployment/opencdmp/annotation/messages/messages.properties rename to deployment/config-files/opencdmp/annotation/messages/messages.properties diff --git a/deployment/opencdmp/annotation/messages/messages_el.properties b/deployment/config-files/opencdmp/annotation/messages/messages_el.properties similarity index 100% rename from deployment/opencdmp/annotation/messages/messages_el.properties rename to deployment/config-files/opencdmp/annotation/messages/messages_el.properties diff --git a/deployment/opencdmp/backend/Semantics.json b/deployment/config-files/opencdmp/backend/Semantics.json similarity index 100% rename from deployment/opencdmp/backend/Semantics.json rename to deployment/config-files/opencdmp/backend/Semantics.json diff --git a/deployment/opencdmp/backend/config/app.env b/deployment/config-files/opencdmp/backend/config/app.env similarity index 100% rename from deployment/opencdmp/backend/config/app.env rename to deployment/config-files/opencdmp/backend/config/app.env diff --git a/deployment/opencdmp/backend/config/cors-test.yml b/deployment/config-files/opencdmp/backend/config/cors-test.yml similarity index 100% rename from deployment/opencdmp/backend/config/cors-test.yml rename to deployment/config-files/opencdmp/backend/config/cors-test.yml diff --git a/deployment/opencdmp/backend/config/dashboard-test.yml b/deployment/config-files/opencdmp/backend/config/dashboard-test.yml similarity index 100% rename from deployment/opencdmp/backend/config/dashboard-test.yml rename to deployment/config-files/opencdmp/backend/config/dashboard-test.yml diff --git a/deployment/opencdmp/backend/config/db-test.yml b/deployment/config-files/opencdmp/backend/config/db-test.yml similarity index 100% rename from deployment/opencdmp/backend/config/db-test.yml rename to deployment/config-files/opencdmp/backend/config/db-test.yml diff --git a/deployment/opencdmp/backend/config/deposit-test.yml b/deployment/config-files/opencdmp/backend/config/deposit-test.yml similarity index 100% rename from deployment/opencdmp/backend/config/deposit-test.yml rename to deployment/config-files/opencdmp/backend/config/deposit-test.yml diff --git a/deployment/opencdmp/backend/config/file-transformer-test.yml b/deployment/config-files/opencdmp/backend/config/file-transformer-test.yml similarity index 100% rename from deployment/opencdmp/backend/config/file-transformer-test.yml rename to deployment/config-files/opencdmp/backend/config/file-transformer-test.yml diff --git a/deployment/opencdmp/backend/config/keycloak-test.yml b/deployment/config-files/opencdmp/backend/config/keycloak-test.yml similarity index 100% rename from deployment/opencdmp/backend/config/keycloak-test.yml rename to deployment/config-files/opencdmp/backend/config/keycloak-test.yml diff --git a/deployment/opencdmp/backend/config/logging-test.yml b/deployment/config-files/opencdmp/backend/config/logging-test.yml similarity index 100% rename from deployment/opencdmp/backend/config/logging-test.yml rename to deployment/config-files/opencdmp/backend/config/logging-test.yml diff --git a/deployment/opencdmp/backend/config/logging/logback-test.xml b/deployment/config-files/opencdmp/backend/config/logging/logback-test.xml similarity index 100% rename from deployment/opencdmp/backend/config/logging/logback-test.xml rename to deployment/config-files/opencdmp/backend/config/logging/logback-test.xml diff --git a/deployment/opencdmp/backend/config/metrics-test.yml b/deployment/config-files/opencdmp/backend/config/metrics-test.yml similarity index 100% rename from deployment/opencdmp/backend/config/metrics-test.yml rename to deployment/config-files/opencdmp/backend/config/metrics-test.yml diff --git a/deployment/opencdmp/backend/config/notification-test.yml b/deployment/config-files/opencdmp/backend/config/notification-test.yml similarity index 100% rename from deployment/opencdmp/backend/config/notification-test.yml rename to deployment/config-files/opencdmp/backend/config/notification-test.yml diff --git a/deployment/opencdmp/backend/config/public-api-test.yml b/deployment/config-files/opencdmp/backend/config/public-api-test.yml similarity index 100% rename from deployment/opencdmp/backend/config/public-api-test.yml rename to deployment/config-files/opencdmp/backend/config/public-api-test.yml diff --git a/deployment/opencdmp/backend/config/queue-test.yml b/deployment/config-files/opencdmp/backend/config/queue-test.yml similarity index 100% rename from deployment/opencdmp/backend/config/queue-test.yml rename to deployment/config-files/opencdmp/backend/config/queue-test.yml diff --git a/deployment/opencdmp/backend/config/security-test.yml b/deployment/config-files/opencdmp/backend/config/security-test.yml similarity index 100% rename from deployment/opencdmp/backend/config/security-test.yml rename to deployment/config-files/opencdmp/backend/config/security-test.yml diff --git a/deployment/opencdmp/backend/config/server-test.yml b/deployment/config-files/opencdmp/backend/config/server-test.yml similarity index 100% rename from deployment/opencdmp/backend/config/server-test.yml rename to deployment/config-files/opencdmp/backend/config/server-test.yml diff --git a/deployment/opencdmp/backend/config/storage-test.yml b/deployment/config-files/opencdmp/backend/config/storage-test.yml similarity index 100% rename from deployment/opencdmp/backend/config/storage-test.yml rename to deployment/config-files/opencdmp/backend/config/storage-test.yml diff --git a/deployment/opencdmp/backend/config/tenant-test.yml b/deployment/config-files/opencdmp/backend/config/tenant-test.yml similarity index 100% rename from deployment/opencdmp/backend/config/tenant-test.yml rename to deployment/config-files/opencdmp/backend/config/tenant-test.yml diff --git a/deployment/opencdmp/backend/i18n/baq.json b/deployment/config-files/opencdmp/backend/i18n/baq.json similarity index 100% rename from deployment/opencdmp/backend/i18n/baq.json rename to deployment/config-files/opencdmp/backend/i18n/baq.json diff --git a/deployment/opencdmp/backend/i18n/de.json b/deployment/config-files/opencdmp/backend/i18n/de.json similarity index 100% rename from deployment/opencdmp/backend/i18n/de.json rename to deployment/config-files/opencdmp/backend/i18n/de.json diff --git a/deployment/opencdmp/backend/i18n/en.json b/deployment/config-files/opencdmp/backend/i18n/en.json similarity index 100% rename from deployment/opencdmp/backend/i18n/en.json rename to deployment/config-files/opencdmp/backend/i18n/en.json diff --git a/deployment/opencdmp/backend/i18n/es.json b/deployment/config-files/opencdmp/backend/i18n/es.json similarity index 100% rename from deployment/opencdmp/backend/i18n/es.json rename to deployment/config-files/opencdmp/backend/i18n/es.json diff --git a/deployment/opencdmp/backend/i18n/gr.json b/deployment/config-files/opencdmp/backend/i18n/gr.json similarity index 100% rename from deployment/opencdmp/backend/i18n/gr.json rename to deployment/config-files/opencdmp/backend/i18n/gr.json diff --git a/deployment/opencdmp/backend/i18n/hr.json b/deployment/config-files/opencdmp/backend/i18n/hr.json similarity index 100% rename from deployment/opencdmp/backend/i18n/hr.json rename to deployment/config-files/opencdmp/backend/i18n/hr.json diff --git a/deployment/opencdmp/backend/i18n/pl.json b/deployment/config-files/opencdmp/backend/i18n/pl.json similarity index 100% rename from deployment/opencdmp/backend/i18n/pl.json rename to deployment/config-files/opencdmp/backend/i18n/pl.json diff --git a/deployment/opencdmp/backend/i18n/pt.json b/deployment/config-files/opencdmp/backend/i18n/pt.json similarity index 100% rename from deployment/opencdmp/backend/i18n/pt.json rename to deployment/config-files/opencdmp/backend/i18n/pt.json diff --git a/deployment/opencdmp/backend/i18n/sk.json b/deployment/config-files/opencdmp/backend/i18n/sk.json similarity index 100% rename from deployment/opencdmp/backend/i18n/sk.json rename to deployment/config-files/opencdmp/backend/i18n/sk.json diff --git a/deployment/opencdmp/backend/i18n/sr.json b/deployment/config-files/opencdmp/backend/i18n/sr.json similarity index 100% rename from deployment/opencdmp/backend/i18n/sr.json rename to deployment/config-files/opencdmp/backend/i18n/sr.json diff --git a/deployment/opencdmp/backend/i18n/tr.json b/deployment/config-files/opencdmp/backend/i18n/tr.json similarity index 100% rename from deployment/opencdmp/backend/i18n/tr.json rename to deployment/config-files/opencdmp/backend/i18n/tr.json diff --git a/deployment/opencdmp/backend/material/about/About_en.html b/deployment/config-files/opencdmp/backend/material/about/About_en.html similarity index 100% rename from deployment/opencdmp/backend/material/about/About_en.html rename to deployment/config-files/opencdmp/backend/material/about/About_en.html diff --git a/deployment/opencdmp/backend/material/faq/Faq_en.html b/deployment/config-files/opencdmp/backend/material/faq/Faq_en.html similarity index 100% rename from deployment/opencdmp/backend/material/faq/Faq_en.html rename to deployment/config-files/opencdmp/backend/material/faq/Faq_en.html diff --git a/deployment/opencdmp/backend/material/glossary/Glossary_en.html b/deployment/config-files/opencdmp/backend/material/glossary/Glossary_en.html similarity index 100% rename from deployment/opencdmp/backend/material/glossary/Glossary_en.html rename to deployment/config-files/opencdmp/backend/material/glossary/Glossary_en.html diff --git a/deployment/opencdmp/backend/material/terms-of-service/TermsOfService_en.html b/deployment/config-files/opencdmp/backend/material/terms-of-service/TermsOfService_en.html similarity index 100% rename from deployment/opencdmp/backend/material/terms-of-service/TermsOfService_en.html rename to deployment/config-files/opencdmp/backend/material/terms-of-service/TermsOfService_en.html diff --git a/deployment/opencdmp/backend/material/user-guide/UserGuide_de.html b/deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_de.html similarity index 100% rename from deployment/opencdmp/backend/material/user-guide/UserGuide_de.html rename to deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_de.html diff --git a/deployment/opencdmp/backend/material/user-guide/UserGuide_en.html b/deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_en.html similarity index 100% rename from deployment/opencdmp/backend/material/user-guide/UserGuide_en.html rename to deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_en.html diff --git a/deployment/opencdmp/backend/material/user-guide/UserGuide_es.html b/deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_es.html similarity index 100% rename from deployment/opencdmp/backend/material/user-guide/UserGuide_es.html rename to deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_es.html diff --git a/deployment/opencdmp/backend/material/user-guide/UserGuide_gr.html b/deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_gr.html similarity index 100% rename from deployment/opencdmp/backend/material/user-guide/UserGuide_gr.html rename to deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_gr.html diff --git a/deployment/opencdmp/backend/material/user-guide/UserGuide_pt.html b/deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_pt.html similarity index 100% rename from deployment/opencdmp/backend/material/user-guide/UserGuide_pt.html rename to deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_pt.html diff --git a/deployment/opencdmp/backend/material/user-guide/UserGuide_sk.html b/deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_sk.html similarity index 100% rename from deployment/opencdmp/backend/material/user-guide/UserGuide_sk.html rename to deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_sk.html diff --git a/deployment/opencdmp/backend/material/user-guide/UserGuide_sr.html b/deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_sr.html similarity index 100% rename from deployment/opencdmp/backend/material/user-guide/UserGuide_sr.html rename to deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_sr.html diff --git a/deployment/opencdmp/backend/material/user-guide/UserGuide_tr.html b/deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_tr.html similarity index 100% rename from deployment/opencdmp/backend/material/user-guide/UserGuide_tr.html rename to deployment/config-files/opencdmp/backend/material/user-guide/UserGuide_tr.html diff --git a/deployment/opencdmp/file-transformer-docx/config/app.env b/deployment/config-files/opencdmp/file-transformer-docx/config/app.env similarity index 100% rename from deployment/opencdmp/file-transformer-docx/config/app.env rename to deployment/config-files/opencdmp/file-transformer-docx/config/app.env diff --git a/deployment/opencdmp/file-transformer-docx/config/documents/styles.xml b/deployment/config-files/opencdmp/file-transformer-docx/config/documents/styles.xml similarity index 100% rename from deployment/opencdmp/file-transformer-docx/config/documents/styles.xml rename to deployment/config-files/opencdmp/file-transformer-docx/config/documents/styles.xml diff --git a/deployment/opencdmp/file-transformer-docx/config/logging-test.yml b/deployment/config-files/opencdmp/file-transformer-docx/config/logging-test.yml similarity index 100% rename from deployment/opencdmp/file-transformer-docx/config/logging-test.yml rename to deployment/config-files/opencdmp/file-transformer-docx/config/logging-test.yml diff --git a/deployment/opencdmp/file-transformer-docx/config/logging/logback-test.xml b/deployment/config-files/opencdmp/file-transformer-docx/config/logging/logback-test.xml similarity index 100% rename from deployment/opencdmp/file-transformer-docx/config/logging/logback-test.xml rename to deployment/config-files/opencdmp/file-transformer-docx/config/logging/logback-test.xml diff --git a/deployment/opencdmp/file-transformer-docx/config/pidLinks.json b/deployment/config-files/opencdmp/file-transformer-docx/config/pidLinks.json similarity index 100% rename from deployment/opencdmp/file-transformer-docx/config/pidLinks.json rename to deployment/config-files/opencdmp/file-transformer-docx/config/pidLinks.json diff --git a/deployment/opencdmp/file-transformer-docx/config/security-test.yml b/deployment/config-files/opencdmp/file-transformer-docx/config/security-test.yml similarity index 100% rename from deployment/opencdmp/file-transformer-docx/config/security-test.yml rename to deployment/config-files/opencdmp/file-transformer-docx/config/security-test.yml diff --git a/deployment/opencdmp/file-transformer-docx/config/word-file-transformer-test.yml b/deployment/config-files/opencdmp/file-transformer-docx/config/word-file-transformer-test.yml similarity index 100% rename from deployment/opencdmp/file-transformer-docx/config/word-file-transformer-test.yml rename to deployment/config-files/opencdmp/file-transformer-docx/config/word-file-transformer-test.yml diff --git a/deployment/opencdmp/file-transformer-rda-json/config/app.env b/deployment/config-files/opencdmp/file-transformer-rda-json/config/app.env similarity index 100% rename from deployment/opencdmp/file-transformer-rda-json/config/app.env rename to deployment/config-files/opencdmp/file-transformer-rda-json/config/app.env diff --git a/deployment/opencdmp/file-transformer-rda-json/config/logging-test.yml b/deployment/config-files/opencdmp/file-transformer-rda-json/config/logging-test.yml similarity index 100% rename from deployment/opencdmp/file-transformer-rda-json/config/logging-test.yml rename to deployment/config-files/opencdmp/file-transformer-rda-json/config/logging-test.yml diff --git a/deployment/opencdmp/file-transformer-rda-json/config/logging/logback-test.xml b/deployment/config-files/opencdmp/file-transformer-rda-json/config/logging/logback-test.xml similarity index 100% rename from deployment/opencdmp/file-transformer-rda-json/config/logging/logback-test.xml rename to deployment/config-files/opencdmp/file-transformer-rda-json/config/logging/logback-test.xml diff --git a/deployment/opencdmp/file-transformer-rda-json/config/rda-file-transformer-test.yml b/deployment/config-files/opencdmp/file-transformer-rda-json/config/rda-file-transformer-test.yml similarity index 100% rename from deployment/opencdmp/file-transformer-rda-json/config/rda-file-transformer-test.yml rename to deployment/config-files/opencdmp/file-transformer-rda-json/config/rda-file-transformer-test.yml diff --git a/deployment/opencdmp/file-transformer-rda-json/config/security-test.yml b/deployment/config-files/opencdmp/file-transformer-rda-json/config/security-test.yml similarity index 100% rename from deployment/opencdmp/file-transformer-rda-json/config/security-test.yml rename to deployment/config-files/opencdmp/file-transformer-rda-json/config/security-test.yml diff --git a/deployment/opencdmp/file-transformer-rda-json/internal/rda-lang-map.json b/deployment/config-files/opencdmp/file-transformer-rda-json/internal/rda-lang-map.json similarity index 100% rename from deployment/opencdmp/file-transformer-rda-json/internal/rda-lang-map.json rename to deployment/config-files/opencdmp/file-transformer-rda-json/internal/rda-lang-map.json diff --git a/deployment/opencdmp/frontend/WebAppNginx.conf b/deployment/config-files/opencdmp/frontend/WebAppNginx.conf similarity index 100% rename from deployment/opencdmp/frontend/WebAppNginx.conf rename to deployment/config-files/opencdmp/frontend/WebAppNginx.conf diff --git a/deployment/opencdmp/frontend/config.json b/deployment/config-files/opencdmp/frontend/config.json similarity index 100% rename from deployment/opencdmp/frontend/config.json rename to deployment/config-files/opencdmp/frontend/config.json diff --git a/deployment/opencdmp/frontend/nginx.conf b/deployment/config-files/opencdmp/frontend/nginx.conf similarity index 100% rename from deployment/opencdmp/frontend/nginx.conf rename to deployment/config-files/opencdmp/frontend/nginx.conf diff --git a/deployment/opencdmp/notification/config/app.env b/deployment/config-files/opencdmp/notification/config/app.env similarity index 100% rename from deployment/opencdmp/notification/config/app.env rename to deployment/config-files/opencdmp/notification/config/app.env diff --git a/deployment/opencdmp/notification/config/cors-test.yml b/deployment/config-files/opencdmp/notification/config/cors-test.yml similarity index 100% rename from deployment/opencdmp/notification/config/cors-test.yml rename to deployment/config-files/opencdmp/notification/config/cors-test.yml diff --git a/deployment/opencdmp/notification/config/db-test.yml b/deployment/config-files/opencdmp/notification/config/db-test.yml similarity index 100% rename from deployment/opencdmp/notification/config/db-test.yml rename to deployment/config-files/opencdmp/notification/config/db-test.yml diff --git a/deployment/opencdmp/notification/config/logging-test.yml b/deployment/config-files/opencdmp/notification/config/logging-test.yml similarity index 100% rename from deployment/opencdmp/notification/config/logging-test.yml rename to deployment/config-files/opencdmp/notification/config/logging-test.yml diff --git a/deployment/opencdmp/notification/config/logging/logback-test.xml b/deployment/config-files/opencdmp/notification/config/logging/logback-test.xml similarity index 100% rename from deployment/opencdmp/notification/config/logging/logback-test.xml rename to deployment/config-files/opencdmp/notification/config/logging/logback-test.xml diff --git a/deployment/opencdmp/notification/config/notification-test.yml b/deployment/config-files/opencdmp/notification/config/notification-test.yml similarity index 100% rename from deployment/opencdmp/notification/config/notification-test.yml rename to deployment/config-files/opencdmp/notification/config/notification-test.yml diff --git a/deployment/opencdmp/notification/config/queue-test.yml b/deployment/config-files/opencdmp/notification/config/queue-test.yml similarity index 100% rename from deployment/opencdmp/notification/config/queue-test.yml rename to deployment/config-files/opencdmp/notification/config/queue-test.yml diff --git a/deployment/opencdmp/notification/config/security-test.yml b/deployment/config-files/opencdmp/notification/config/security-test.yml similarity index 100% rename from deployment/opencdmp/notification/config/security-test.yml rename to deployment/config-files/opencdmp/notification/config/security-test.yml diff --git a/deployment/opencdmp/notification/config/server-test.yml b/deployment/config-files/opencdmp/notification/config/server-test.yml similarity index 100% rename from deployment/opencdmp/notification/config/server-test.yml rename to deployment/config-files/opencdmp/notification/config/server-test.yml diff --git a/deployment/opencdmp/notification/config/tenant-test.yml b/deployment/config-files/opencdmp/notification/config/tenant-test.yml similarity index 100% rename from deployment/opencdmp/notification/config/tenant-test.yml rename to deployment/config-files/opencdmp/notification/config/tenant-test.yml diff --git a/deployment/opencdmp/notification/messages/messages.properties b/deployment/config-files/opencdmp/notification/messages/messages.properties similarity index 100% rename from deployment/opencdmp/notification/messages/messages.properties rename to deployment/config-files/opencdmp/notification/messages/messages.properties diff --git a/deployment/opencdmp/notification/messages/messages_el.properties b/deployment/config-files/opencdmp/notification/messages/messages_el.properties similarity index 100% rename from deployment/opencdmp/notification/messages/messages_el.properties rename to deployment/config-files/opencdmp/notification/messages/messages_el.properties diff --git a/deployment/opencdmp/notification/notification_templates/contactsupport/email/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/contactsupport/email/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/contactsupport/email/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/contactsupport/email/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/contactsupport/email/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/contactsupport/email/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/contactsupport/email/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/contactsupport/email/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/descriptionfinalised/email/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/descriptionfinalised/email/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descriptionfinalised/email/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/descriptionfinalised/email/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/descriptionfinalised/email/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/descriptionfinalised/email/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descriptionfinalised/email/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/descriptionfinalised/email/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/descriptionfinalised/inapp/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/descriptionfinalised/inapp/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descriptionfinalised/inapp/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/descriptionfinalised/inapp/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/descriptionfinalised/inapp/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/descriptionfinalised/inapp/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descriptionfinalised/inapp/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/descriptionfinalised/inapp/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/descriptionmodified/email/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/descriptionmodified/email/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descriptionmodified/email/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/descriptionmodified/email/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/descriptionmodified/email/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/descriptionmodified/email/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descriptionmodified/email/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/descriptionmodified/email/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/descriptionmodified/inapp/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/descriptionmodified/inapp/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descriptionmodified/inapp/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/descriptionmodified/inapp/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/descriptionmodified/inapp/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/descriptionmodified/inapp/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descriptionmodified/inapp/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/descriptionmodified/inapp/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/descriptiontemplateinvitation/email/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/descriptiontemplateinvitation/email/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descriptiontemplateinvitation/email/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/descriptiontemplateinvitation/email/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/descriptiontemplateinvitation/email/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/descriptiontemplateinvitation/email/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descriptiontemplateinvitation/email/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/descriptiontemplateinvitation/email/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/descriptiontemplateinvitation/inapp/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/descriptiontemplateinvitation/inapp/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descriptiontemplateinvitation/inapp/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/descriptiontemplateinvitation/inapp/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/descriptiontemplateinvitation/inapp/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/descriptiontemplateinvitation/inapp/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descriptiontemplateinvitation/inapp/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/descriptiontemplateinvitation/inapp/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/descrptionfinalised/email/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/descrptionfinalised/email/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descrptionfinalised/email/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/descrptionfinalised/email/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/descrptionfinalised/email/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/descrptionfinalised/email/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descrptionfinalised/email/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/descrptionfinalised/email/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/descrptionfinalised/inapp/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/descrptionfinalised/inapp/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descrptionfinalised/inapp/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/descrptionfinalised/inapp/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/descrptionfinalised/inapp/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/descrptionfinalised/inapp/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/descrptionfinalised/inapp/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/descrptionfinalised/inapp/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/dmpdeposit/email/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/dmpdeposit/email/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpdeposit/email/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/dmpdeposit/email/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/dmpdeposit/email/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/dmpdeposit/email/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpdeposit/email/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/dmpdeposit/email/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/dmpdeposit/inapp/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/dmpdeposit/inapp/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpdeposit/inapp/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/dmpdeposit/inapp/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/dmpdeposit/inapp/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/dmpdeposit/inapp/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpdeposit/inapp/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/dmpdeposit/inapp/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/dmpfinalised/email/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/dmpfinalised/email/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpfinalised/email/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/dmpfinalised/email/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/dmpfinalised/email/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/dmpfinalised/email/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpfinalised/email/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/dmpfinalised/email/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/dmpfinalised/inapp/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/dmpfinalised/inapp/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpfinalised/inapp/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/dmpfinalised/inapp/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/dmpfinalised/inapp/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/dmpfinalised/inapp/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpfinalised/inapp/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/dmpfinalised/inapp/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/dmpinvitationexistinguser/email/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/dmpinvitationexistinguser/email/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpinvitationexistinguser/email/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/dmpinvitationexistinguser/email/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/dmpinvitationexistinguser/email/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/dmpinvitationexistinguser/email/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpinvitationexistinguser/email/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/dmpinvitationexistinguser/email/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/dmpinvitationexistinguser/inapp/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/dmpinvitationexistinguser/inapp/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpinvitationexistinguser/inapp/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/dmpinvitationexistinguser/inapp/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/dmpinvitationexistinguser/inapp/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/dmpinvitationexistinguser/inapp/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpinvitationexistinguser/inapp/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/dmpinvitationexistinguser/inapp/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/dmpinvitationexternaluser/email/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/dmpinvitationexternaluser/email/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpinvitationexternaluser/email/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/dmpinvitationexternaluser/email/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/dmpinvitationexternaluser/email/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/dmpinvitationexternaluser/email/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpinvitationexternaluser/email/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/dmpinvitationexternaluser/email/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/dmpmodified/email/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/dmpmodified/email/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpmodified/email/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/dmpmodified/email/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/dmpmodified/email/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/dmpmodified/email/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpmodified/email/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/dmpmodified/email/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/dmpmodified/inapp/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/dmpmodified/inapp/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpmodified/inapp/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/dmpmodified/inapp/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/dmpmodified/inapp/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/dmpmodified/inapp/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/dmpmodified/inapp/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/dmpmodified/inapp/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/mergeacountconfirmation/email/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/mergeacountconfirmation/email/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/mergeacountconfirmation/email/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/mergeacountconfirmation/email/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/mergeacountconfirmation/email/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/mergeacountconfirmation/email/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/mergeacountconfirmation/email/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/mergeacountconfirmation/email/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/mergeacountconfirmation/inapp/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/mergeacountconfirmation/inapp/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/mergeacountconfirmation/inapp/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/mergeacountconfirmation/inapp/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/mergeacountconfirmation/inapp/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/mergeacountconfirmation/inapp/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/mergeacountconfirmation/inapp/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/mergeacountconfirmation/inapp/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/publiccontactsupport/email/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/publiccontactsupport/email/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/publiccontactsupport/email/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/publiccontactsupport/email/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/publiccontactsupport/email/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/publiccontactsupport/email/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/publiccontactsupport/email/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/publiccontactsupport/email/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/removecredentialconfirmation/email/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/removecredentialconfirmation/email/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/removecredentialconfirmation/email/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/removecredentialconfirmation/email/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/removecredentialconfirmation/email/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/removecredentialconfirmation/email/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/removecredentialconfirmation/email/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/removecredentialconfirmation/email/subject.en.txt diff --git a/deployment/opencdmp/notification/notification_templates/removecredentialconfirmation/inapp/body.en.html b/deployment/config-files/opencdmp/notification/notification_templates/removecredentialconfirmation/inapp/body.en.html similarity index 100% rename from deployment/opencdmp/notification/notification_templates/removecredentialconfirmation/inapp/body.en.html rename to deployment/config-files/opencdmp/notification/notification_templates/removecredentialconfirmation/inapp/body.en.html diff --git a/deployment/opencdmp/notification/notification_templates/removecredentialconfirmation/inapp/subject.en.txt b/deployment/config-files/opencdmp/notification/notification_templates/removecredentialconfirmation/inapp/subject.en.txt similarity index 100% rename from deployment/opencdmp/notification/notification_templates/removecredentialconfirmation/inapp/subject.en.txt rename to deployment/config-files/opencdmp/notification/notification_templates/removecredentialconfirmation/inapp/subject.en.txt diff --git a/deployment/opencdmp/zenodo/config/app.env b/deployment/config-files/opencdmp/zenodo/config/app.env similarity index 100% rename from deployment/opencdmp/zenodo/config/app.env rename to deployment/config-files/opencdmp/zenodo/config/app.env diff --git a/deployment/opencdmp/zenodo/config/logging-test.yml b/deployment/config-files/opencdmp/zenodo/config/logging-test.yml similarity index 100% rename from deployment/opencdmp/zenodo/config/logging-test.yml rename to deployment/config-files/opencdmp/zenodo/config/logging-test.yml diff --git a/deployment/opencdmp/zenodo/config/logging/logback-test.xml b/deployment/config-files/opencdmp/zenodo/config/logging/logback-test.xml similarity index 100% rename from deployment/opencdmp/zenodo/config/logging/logback-test.xml rename to deployment/config-files/opencdmp/zenodo/config/logging/logback-test.xml diff --git a/deployment/opencdmp/zenodo/config/security-test.yml b/deployment/config-files/opencdmp/zenodo/config/security-test.yml similarity index 100% rename from deployment/opencdmp/zenodo/config/security-test.yml rename to deployment/config-files/opencdmp/zenodo/config/security-test.yml diff --git a/deployment/opencdmp/zenodo/config/server-test.yml b/deployment/config-files/opencdmp/zenodo/config/server-test.yml similarity index 100% rename from deployment/opencdmp/zenodo/config/server-test.yml rename to deployment/config-files/opencdmp/zenodo/config/server-test.yml diff --git a/deployment/opencdmp/zenodo/config/zenodo-test.yml b/deployment/config-files/opencdmp/zenodo/config/zenodo-test.yml similarity index 100% rename from deployment/opencdmp/zenodo/config/zenodo-test.yml rename to deployment/config-files/opencdmp/zenodo/config/zenodo-test.yml diff --git a/deployment/opencdmp/zenodo/zenodo.jpg b/deployment/config-files/opencdmp/zenodo/zenodo.jpg similarity index 100% rename from deployment/opencdmp/zenodo/zenodo.jpg rename to deployment/config-files/opencdmp/zenodo/zenodo.jpg diff --git a/deployment/gotenberg/gotenberg.env b/deployment/config-files/pdf-service/pdf-service.env similarity index 100% rename from deployment/gotenberg/gotenberg.env rename to deployment/config-files/pdf-service/pdf-service.env diff --git a/deployment/postgres/opencdmp_init.sql b/deployment/config-files/postgres/opencdmp_init.sql similarity index 100% rename from deployment/postgres/opencdmp_init.sql rename to deployment/config-files/postgres/opencdmp_init.sql diff --git a/deployment/postgres/postgres.env b/deployment/config-files/postgres/postgres.env similarity index 100% rename from deployment/postgres/postgres.env rename to deployment/config-files/postgres/postgres.env diff --git a/deployment/proxy/ProxyNginx.conf b/deployment/config-files/proxy/ProxyNginx.conf similarity index 100% rename from deployment/proxy/ProxyNginx.conf rename to deployment/config-files/proxy/ProxyNginx.conf diff --git a/deployment/proxy/nginx.conf b/deployment/config-files/proxy/nginx.conf similarity index 100% rename from deployment/proxy/nginx.conf rename to deployment/config-files/proxy/nginx.conf diff --git a/deployment/rabbitmq/rabbitmq.conf b/deployment/config-files/rabbitmq/rabbitmq.conf similarity index 100% rename from deployment/rabbitmq/rabbitmq.conf rename to deployment/config-files/rabbitmq/rabbitmq.conf diff --git a/deployment/rabbitmq/rabbitmq.env b/deployment/config-files/rabbitmq/rabbitmq.env similarity index 100% rename from deployment/rabbitmq/rabbitmq.env rename to deployment/config-files/rabbitmq/rabbitmq.env diff --git a/deployment/deploy_opencdmp.sh b/deployment/deploy_opencdmp.sh index 2fbfe88dc..ed63572be 100644 --- a/deployment/deploy_opencdmp.sh +++ b/deployment/deploy_opencdmp.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e -networks=("opencdmp-elastic-shared-network" "opencdmp-gotenberg-shared-network" "opencdmp-keycloak-shared-network" "opencdmp-postgres-shared-network" "opencdmp-rabbitmq-shared-network") +networks=("opencdmp-elastic-shared-network" "opencdmp-pdf-service-shared-network" "opencdmp-keycloak-shared-network" "opencdmp-postgres-shared-network" "opencdmp-rabbitmq-shared-network") network_exists() { local name="$1" diff --git a/deployment/docker-compose.override.yml b/deployment/docker-compose.override.yml index 65574eb8e..2dfa29367 100644 --- a/deployment/docker-compose.override.yml +++ b/deployment/docker-compose.override.yml @@ -108,7 +108,7 @@ services: # - ${STORAGE_PATH}opencdmp/file-transformer-docx:/storage networks: - opencdmp-plugins-network - - opencdmp-gotenberg-shared-network + - opencdmp-pdf-service-shared-network opencdmp.file.transformer.rdajson: restart: unless-stopped @@ -123,7 +123,6 @@ services: - ${CONFIG_FILES_PATH}opencdmp/file-transformer-rda-json/config:/config - ${CONFIG_FILES_PATH}opencdmp/file-transformer-rda-json/internal:/internal - ${LOG_FILES_PATH}opencdmp/file-transformer-rda-json:/logs - # - ${STORAGE_PATH}opencdmp/file-transformer-rda-json:/storage networks: - opencdmp-plugins-network @@ -140,7 +139,6 @@ services: - ${CONFIG_FILES_PATH}opencdmp/zenodo/config:/config - ${CONFIG_FILES_PATH}opencdmp/zenodo/zenodo.jpg:/zenodo.jpg - ${LOG_FILES_PATH}opencdmp/zenodo:/logs - # - ${STORAGE_PATH}opencdmp/zenodo:/storage networks: - opencdmp-plugins-network - opencdmp-keycloak-shared-network @@ -151,7 +149,6 @@ services: restart: unless-stopped mem_limit: 2048M ports: - # - "127.0.0.1:${POSTGRES_PORT}:5432" # If you want to make it accessible locally only - "${POSTGRES_PORT}:5432" env_file: - ${CONFIG_FILES_PATH}postgres/postgres.env @@ -236,18 +233,18 @@ services: networks: - opencdmp-rabbitmq-shared-network -################################# GOTENBERG ############################################## +################################# PDF SERVICE ############################################## opencdmp.pdf-service: cpus: 2 mem_limit: 2048m restart: unless-stopped expose: - "3000" - hostname: gotenberg + hostname: pdf-service env_file: - - ${CONFIG_FILES_PATH}gotenberg/gotenberg.env + - ${CONFIG_FILES_PATH}pdf-service/pdf-service.env networks: - - opencdmp-gotenberg-shared-network + - opencdmp-pdf-service-shared-network ################################# DOCS ################################# @@ -268,9 +265,9 @@ networks: opencdmp-keycloak-shared-network: external: true name: opencdmp-keycloak-shared-network - opencdmp-gotenberg-shared-network: + opencdmp-pdf-service-shared-network: external: true - name: opencdmp-gotenberg-shared-network + name: opencdmp-pdf-service-shared-network opencdmp-rabbitmq-shared-network: external: true name: opencdmp-rabbitmq-shared-network diff --git a/deployment/elk/elk.env b/deployment/elk/elk.env deleted file mode 100644 index 9cda7cf1e..000000000 --- a/deployment/elk/elk.env +++ /dev/null @@ -1 +0,0 @@ -ELASTIC_PASSWORD= elastic \ No newline at end of file diff --git a/deployment/storage/.gitkeep b/deployment/storage/.gitkeep new file mode 100644 index 000000000..e69de29bb