From fa93031a6e9b400bdfd9a6cc8702916dbba06732 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Thu, 23 Mar 2023 14:50:18 -0700
Subject: [PATCH] #88 Rename stack and substack networks

---
 server/config/ddns/docker-compose.yml      |  5 +++++
 server/config/gitlab/docker-compose.yml    |  6 ++++++
 server/config/minecraft/docker-compose.yml | 11 +++++------
 server/config/vandam/docker-compose.yml    |  8 ++++----
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/server/config/ddns/docker-compose.yml b/server/config/ddns/docker-compose.yml
index 6c49c65..25149ef 100644
--- a/server/config/ddns/docker-compose.yml
+++ b/server/config/ddns/docker-compose.yml
@@ -12,9 +12,14 @@ services:
         loki-timeout: "2s"
         keep-file: "true"
     restart: "no"
+    networks:
+      - ddns
     env_file:
       - ddclient.env
     volumes:
       - ./ddclient:/config
     labels:
       - traefik.enable=false
+
+networks:
+  ddns:
\ No newline at end of file
diff --git a/server/config/gitlab/docker-compose.yml b/server/config/gitlab/docker-compose.yml
index 7be4308..510aed5 100644
--- a/server/config/gitlab/docker-compose.yml
+++ b/server/config/gitlab/docker-compose.yml
@@ -19,6 +19,7 @@ services:
     hostname: 'gitlab.jafner.net'
     networks:
       - web
+      - gitlab
     environment:
       GITLAB_OMNIBUS_CONFIG: |
         external_url 'https://gitlab.jafner.net'
@@ -109,6 +110,8 @@ services:
         loki-timeout: "2s"
         keep-file: "true"
     restart: "no"
+    networks:
+      - gitlab
     env_file:
       - runner.env
     volumes:
@@ -129,6 +132,8 @@ services:
         loki-timeout: "2s"
         keep-file: "true"
     restart: "no"
+    networks:
+      - gitlab
     env_file:
       - runner.env
     volumes:
@@ -140,3 +145,4 @@ services:
 networks:
   web:
     external: true
+  gitlab:
\ No newline at end of file
diff --git a/server/config/minecraft/docker-compose.yml b/server/config/minecraft/docker-compose.yml
index 0ddeee8..e435c58 100644
--- a/server/config/minecraft/docker-compose.yml
+++ b/server/config/minecraft/docker-compose.yml
@@ -13,7 +13,7 @@ services:
         keep-file: "true"
     restart: "no"
     networks:
-      - mc-router
+      - minecraft
     ports:
       - 25565:25565
     command: --mapping=bmcp.janfer.net=bmcp:25565,e9.janfer.net=e9:25565,fan.janfer.net=fan:25565,vanilla.janfer.net=vanilla:25565,vanilla2.janfer.net=vanilla2:25565 --api-binding=0.0.0.0:25566
@@ -33,7 +33,7 @@ services:
     restart: "no"
     networks:
       - monitoring
-      - mc-router
+      - minecraft
     env_file:
       - exporter.env
     labels:
@@ -48,7 +48,7 @@ services:
     volumes:
       - $DOCKER_DATA/bmcp2:/data:rw
     networks:
-      - mc-router
+      - minecraft
     restart: "no"
 
   vanilla:
@@ -68,11 +68,10 @@ services:
     volumes:
       - $DOCKER_DATA/vanilla:/data:rw
     networks:
-      - mc-router
+      - minecraft
 
 networks:
-  mc-router:
-    external: true
+  minecraft:
   monitoring: 
     external: true
 volumes:
diff --git a/server/config/vandam/docker-compose.yml b/server/config/vandam/docker-compose.yml
index a751341..a41367e 100644
--- a/server/config/vandam/docker-compose.yml
+++ b/server/config/vandam/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - ${STL_DIR}:/libraries
     networks:
       - web
-      - default
+      - vandam
     labels:
       - traefik.http.routers.vandam.rule=Host(`3d.jafner.net`)
       - traefik.http.routers.vandam.tls.certresolver=lets-encrypt
@@ -23,7 +23,7 @@ services:
     image: postgres:13
     container_name: vandam_postgres
     networks:
-      - default
+      - vandam
     env_file:
       - db_secrets.env
     volumes:
@@ -32,7 +32,7 @@ services:
   redis:
     image: redis:6
     networks:
-      - default
+      - vandam
     container_name: vandam_redis
 
 volumes:
@@ -41,4 +41,4 @@ volumes:
 networks:
   web:
     external: true
-  default:
\ No newline at end of file
+  vandam:
\ No newline at end of file