diff --git a/deploy/dockerephemeral/docker-compose.yaml b/deploy/dockerephemeral/docker-compose.yaml index 836b687612a..538ef0aa668 100644 --- a/deploy/dockerephemeral/docker-compose.yaml +++ b/deploy/dockerephemeral/docker-compose.yaml @@ -225,16 +225,16 @@ services: - ./docker/elasticsearch-cert.pem:/usr/share/opensearch/config/certs/tls.crt - ./docker/elasticsearch-key.pem:/usr/share/opensearch/config/certs/tls.key - ./docker/elasticsearch-ca.pem:/usr/share/opensearch/config/certs/ca.crt - - ./docker/opensearch.yml:/usr/share/opensearch/config/opensearch.yml - - ./docker/opensearch-security-config.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/config.yml - - ./docker/opensearch-security-internal_users.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/internal_users.yml - - ./docker/opensearch-security-roles_mapping.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/roles_mapping.yml - - ./docker/opensearch-security-allowlist.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/allowlist.yml - - ./docker/opensearch-security-roles.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/roles.yml - - ./docker/opensearch-security-nodes_dn.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/nodes_dn.yml - - ./docker/opensearch-security-action_groups.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/action_groups.yml - - ./docker/opensearch-security-tenants.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/tenants.yml - - ./docker/opensearch-security-plugin-descriptor.properties:/usr/share/opensearch/plugins/opensearch-security/plugin-descriptor.properties + - ./docker/opensearch/opensearch.yml:/usr/share/opensearch/config/opensearch.yml + - ./docker/opensearch/opensearch-security/config.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/config.yml + - ./docker/opensearch/opensearch-security/internal_users.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/internal_users.yml + - ./docker/opensearch/opensearch-security/roles_mapping.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/roles_mapping.yml + - ./docker/opensearch/opensearch-security/allowlist.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/allowlist.yml + - ./docker/opensearch/opensearch-security/roles.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/roles.yml + - ./docker/opensearch/opensearch-security/nodes_dn.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/nodes_dn.yml + - ./docker/opensearch/opensearch-security/action_groups.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/action_groups.yml + - ./docker/opensearch/opensearch-security/tenants.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/tenants.yml + - ./docker/opensearch/opensearch-security/plugin-descriptor.properties:/usr/share/opensearch/plugins/opensearch-security/plugin-descriptor.properties networks: - demo_wire @@ -246,7 +246,7 @@ services: expose: - "5601" volumes: - - ./docker/opensearch_dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml + - ./docker/opensearch/opensearch_dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml networks: - demo_wire diff --git a/deploy/dockerephemeral/docker/opensearch-security-action_groups.yml b/deploy/dockerephemeral/docker/opensearch/opensearch-security/action_groups.yml similarity index 100% rename from deploy/dockerephemeral/docker/opensearch-security-action_groups.yml rename to deploy/dockerephemeral/docker/opensearch/opensearch-security/action_groups.yml diff --git a/deploy/dockerephemeral/docker/opensearch-security-allowlist.yml b/deploy/dockerephemeral/docker/opensearch/opensearch-security/allowlist.yml similarity index 100% rename from deploy/dockerephemeral/docker/opensearch-security-allowlist.yml rename to deploy/dockerephemeral/docker/opensearch/opensearch-security/allowlist.yml diff --git a/deploy/dockerephemeral/docker/opensearch-security-config.yml b/deploy/dockerephemeral/docker/opensearch/opensearch-security/config.yml similarity index 100% rename from deploy/dockerephemeral/docker/opensearch-security-config.yml rename to deploy/dockerephemeral/docker/opensearch/opensearch-security/config.yml diff --git a/deploy/dockerephemeral/docker/opensearch-security-internal_users.yml b/deploy/dockerephemeral/docker/opensearch/opensearch-security/internal_users.yml similarity index 100% rename from deploy/dockerephemeral/docker/opensearch-security-internal_users.yml rename to deploy/dockerephemeral/docker/opensearch/opensearch-security/internal_users.yml diff --git a/deploy/dockerephemeral/docker/opensearch-security-nodes_dn.yml b/deploy/dockerephemeral/docker/opensearch/opensearch-security/nodes_dn.yml similarity index 100% rename from deploy/dockerephemeral/docker/opensearch-security-nodes_dn.yml rename to deploy/dockerephemeral/docker/opensearch/opensearch-security/nodes_dn.yml diff --git a/deploy/dockerephemeral/docker/opensearch-security-plugin-descriptor.properties b/deploy/dockerephemeral/docker/opensearch/opensearch-security/plugin-descriptor.properties similarity index 100% rename from deploy/dockerephemeral/docker/opensearch-security-plugin-descriptor.properties rename to deploy/dockerephemeral/docker/opensearch/opensearch-security/plugin-descriptor.properties diff --git a/deploy/dockerephemeral/docker/opensearch-security-roles.yml b/deploy/dockerephemeral/docker/opensearch/opensearch-security/roles.yml similarity index 100% rename from deploy/dockerephemeral/docker/opensearch-security-roles.yml rename to deploy/dockerephemeral/docker/opensearch/opensearch-security/roles.yml diff --git a/deploy/dockerephemeral/docker/opensearch-security-roles_mapping.yml b/deploy/dockerephemeral/docker/opensearch/opensearch-security/roles_mapping.yml similarity index 100% rename from deploy/dockerephemeral/docker/opensearch-security-roles_mapping.yml rename to deploy/dockerephemeral/docker/opensearch/opensearch-security/roles_mapping.yml diff --git a/deploy/dockerephemeral/docker/opensearch-security-tenants.yml b/deploy/dockerephemeral/docker/opensearch/opensearch-security/tenants.yml similarity index 100% rename from deploy/dockerephemeral/docker/opensearch-security-tenants.yml rename to deploy/dockerephemeral/docker/opensearch/opensearch-security/tenants.yml diff --git a/deploy/dockerephemeral/docker/opensearch.yml b/deploy/dockerephemeral/docker/opensearch/opensearch.yml similarity index 100% rename from deploy/dockerephemeral/docker/opensearch.yml rename to deploy/dockerephemeral/docker/opensearch/opensearch.yml diff --git a/deploy/dockerephemeral/docker/opensearch_dashboards.yml b/deploy/dockerephemeral/docker/opensearch/opensearch_dashboards.yml similarity index 100% rename from deploy/dockerephemeral/docker/opensearch_dashboards.yml rename to deploy/dockerephemeral/docker/opensearch/opensearch_dashboards.yml