From 72e1fabd9830f5a6cfbc1cffa28bf734d0cfd003 Mon Sep 17 00:00:00 2001
From: elAgala <julian@benitez.com.ar>
Date: Sat, 25 Jan 2025 04:42:51 -0300
Subject: [PATCH] Add caddy_net for allowing VPN access to containers from the
 WebServer

---
 templates/caddy/Caddyfile                       | 2 +-
 templates/caddy/docker-compose.yml              | 7 ++++++-
 templates/monitoring/docker-compose.grafana.yml | 1 +
 templates/monitoring/docker-compose.yml         | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/templates/caddy/Caddyfile b/templates/caddy/Caddyfile
index 1ef68a5..fee5d86 100644
--- a/templates/caddy/Caddyfile
+++ b/templates/caddy/Caddyfile
@@ -6,5 +6,5 @@ domain.com {
 
 # Reverse proxy
 ssl.test.benitez.ar {
-        reverse_proxy * http://localhost:9090
+        reverse_proxy * http://{CONTAINER_NAME}:{CONTAINER_PORT}
 }
diff --git a/templates/caddy/docker-compose.yml b/templates/caddy/docker-compose.yml
index 681862a..e4d131a 100644
--- a/templates/caddy/docker-compose.yml
+++ b/templates/caddy/docker-compose.yml
@@ -2,7 +2,6 @@ services:
   caddy:
     image: caddy:latest
     container_name: caddy
-    network_mode: "host" # Allow access to local networks (EX: Backend running on port 3000)
     ports:
       - "80:80"
       - "443:443"
@@ -12,3 +11,9 @@ services:
       - ./caddy_data:/data
       - ./caddy_config:/config
     restart: unless-stopped
+    networks:
+      - caddy_net
+
+networks:
+  caddy_net: # Crete VPN internal - Need to bind running containers to this network as well
+    driver: bridge
diff --git a/templates/monitoring/docker-compose.grafana.yml b/templates/monitoring/docker-compose.grafana.yml
index a7ea3a9..86300eb 100644
--- a/templates/monitoring/docker-compose.grafana.yml
+++ b/templates/monitoring/docker-compose.grafana.yml
@@ -9,6 +9,7 @@ services:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
     networks:
       - monitoring_net
+      - caddy_net
 
   grafana:
     image: grafana/grafana:latest
diff --git a/templates/monitoring/docker-compose.yml b/templates/monitoring/docker-compose.yml
index 19a4f7b..8a4702b 100644
--- a/templates/monitoring/docker-compose.yml
+++ b/templates/monitoring/docker-compose.yml
@@ -9,6 +9,7 @@ services:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
     networks:
       - monitoring_net
+      - caddy_net
 
   node_exporter:
     image: prom/node-exporter:latest