From 3c1ee2ba1d7d2928819368e93dd09b6a866c2ce9 Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Mon, 20 Mar 2023 09:38:45 +0100
Subject: [PATCH] Fix networks

---
 templates/multinode/docker-compose_cache.yml.erb     | 11 +++++++++++
 templates/multinode/docker-compose_nextcloud.yml.erb |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/templates/multinode/docker-compose_cache.yml.erb b/templates/multinode/docker-compose_cache.yml.erb
index 0248ff4..6469995 100644
--- a/templates/multinode/docker-compose_cache.yml.erb
+++ b/templates/multinode/docker-compose_cache.yml.erb
@@ -13,9 +13,20 @@ services:
       command: redis-server /data/redis.conf --loglevel verbose
       restart: always
       networks:
+<%- if @environment == 'test' -%>
+        - proxysql_proxysql
+<%- else %>
         - mariadb-<%= @customer %>_<%= @customer %>
+<% end -%>
 
 networks:
   mariadb-<%= @customer %>_<%= @customer %>:
     external: true
+<%- if @environment == 'test' -%>
+  proxysql_proxysql:
+    external: true
+<%- else %>
+  mariadb-<%= @customer %>_<%= @customer %>:
+    external: true
+<% end -%>
 
diff --git a/templates/multinode/docker-compose_nextcloud.yml.erb b/templates/multinode/docker-compose_nextcloud.yml.erb
index e64619c..59f01d5 100644
--- a/templates/multinode/docker-compose_nextcloud.yml.erb
+++ b/templates/multinode/docker-compose_nextcloud.yml.erb
@@ -16,9 +16,10 @@ services:
       - <%= @rclone_conf_path %>:/rclone.conf
     networks:
       - default
-      - mariadb-<%= @customer %>_<%= @customer %>
 <%- if @environment == 'test' -%>
       - proxysql_proxysql
+<%- else %>
+      - mariadb-<%= @customer %>_<%= @customer %>
 <% end -%>
     dns:
       - 89.46.20.75
@@ -33,6 +34,7 @@ networks:
 <%- if @environment == 'test' -%>
   proxysql_proxysql:
     external: true
-<% end -%>
+<%- else %>
   mariadb-<%= @customer %>_<%= @customer %>:
     external: true
+<% end -%>