Cleanup docker-compose.yml

wireapp · Oct 9, 2024 · 5faf6cb · 5faf6cb
1 parent c19c07a
commit 5faf6cb
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 11 deletions.
diff --git 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/...ker/opensearch-security-action_groups.yml → ...rch/opensearch-security/action_groups.yml b/...ker/opensearch-security-action_groups.yml → ...rch/opensearch-security/action_groups.yml
diff --git a/.../docker/opensearch-security-allowlist.yml → ...nsearch/opensearch-security/allowlist.yml b/.../docker/opensearch-security-allowlist.yml → ...nsearch/opensearch-security/allowlist.yml
diff --git a/...ral/docker/opensearch-security-config.yml → ...opensearch/opensearch-security/config.yml b/...ral/docker/opensearch-security-config.yml → ...opensearch/opensearch-security/config.yml
diff --git a/...er/opensearch-security-internal_users.yml → ...ch/opensearch-security/internal_users.yml b/...er/opensearch-security-internal_users.yml → ...ch/opensearch-security/internal_users.yml
diff --git a/...l/docker/opensearch-security-nodes_dn.yml → ...ensearch/opensearch-security/nodes_dn.yml b/...l/docker/opensearch-security-nodes_dn.yml → ...ensearch/opensearch-security/nodes_dn.yml
diff --git a/...rch-security-plugin-descriptor.properties → ...rch-security/plugin-descriptor.properties b/...rch-security-plugin-descriptor.properties → ...rch-security/plugin-descriptor.properties
diff --git a/...eral/docker/opensearch-security-roles.yml → .../opensearch/opensearch-security/roles.yml b/...eral/docker/opensearch-security-roles.yml → .../opensearch/opensearch-security/roles.yml
diff --git a/...ker/opensearch-security-roles_mapping.yml → ...rch/opensearch-security/roles_mapping.yml b/...ker/opensearch-security-roles_mapping.yml → ...rch/opensearch-security/roles_mapping.yml
diff --git a/...al/docker/opensearch-security-tenants.yml → ...pensearch/opensearch-security/tenants.yml b/...al/docker/opensearch-security-tenants.yml → ...pensearch/opensearch-security/tenants.yml
diff --git a/deploy/dockerephemeral/docker/opensearch.yml → ...phemeral/docker/opensearch/opensearch.yml b/deploy/dockerephemeral/docker/opensearch.yml → ...phemeral/docker/opensearch/opensearch.yml
diff --git a/...phemeral/docker/opensearch_dashboards.yml → ...cker/opensearch/opensearch_dashboards.yml b/...phemeral/docker/opensearch_dashboards.yml → ...cker/opensearch/opensearch_dashboards.yml