From 84609f78612f492002a4e2bc7ac3751e85724f2b Mon Sep 17 00:00:00 2001
From: Jeroen Vijgen <14365378+BlackChaosNL@users.noreply.github.com>
Date: Fri, 27 Mar 2026 23:14:36 +0200
Subject: [PATCH] Revert network changes

---
 README.md                                               | 6 +++---
 modules/01-networking/caddy-service/main.tf             | 2 +-
 modules/20-services-entertainment/wings-service/main.tf | 2 +-
 modules/30-services-software/authentik-service/main.tf  | 2 +-
 modules/30-services-software/coder-service/main.tf      | 2 +-
 modules/30-services-software/penpot-service/main.tf     | 2 +-
 modules/30-services-software/tandoor-service/main.tf    | 2 +-
 services/main.tf                                        | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 90f06f1..edd5553 100644
--- a/README.md
+++ b/README.md
@@ -52,8 +52,8 @@ homelab/
 
 For the global network I use the following IP range and Subnet:
 
-- 172.16.0.0 - 172.16.252.252
-- 255.255.0.0 (/12)
+- 10.100.0.0 - 10.100.0.254
+- 255.255.255.0 (/24)
 
 You will get 253 usable host addresses per network. This network is mainly for connecting pods to Caddy as the external ingress.
 
@@ -61,7 +61,7 @@ You will get 253 usable host addresses per network. This network is mainly for c
 
 For connecting pods to each other (For example: Postgres -> Project <- Redis ) I use the following IP range and Subnet:
 
-- 172.32.0.0 - 172.32.0.254 
+- 172.17.0.0 - 172.17.0.254 
 - 255.255.255.248 (/29)
 
 You get 6 usable host addresses per internal network, to find the usable addresses you can check [here](https://www.calculator.net/ip-subnet-calculator.html?cclass=b&csubnet=29&cip=172.16.0.0&ctype=ipv4&x=Calculate).
diff --git a/modules/01-networking/caddy-service/main.tf b/modules/01-networking/caddy-service/main.tf
index 3fd2597..c6c815c 100644
--- a/modules/01-networking/caddy-service/main.tf
+++ b/modules/01-networking/caddy-service/main.tf
@@ -39,7 +39,7 @@ locals {
     email ${var.tls_email}
 
     servers {
-        trusted_proxies static 172.16.0.0/12 10.0.0.0/8 192.168.0.0/16
+        trusted_proxies static 172.16.0.0/12 10.0.0.0/8 192.168.0.0/16 10.88.0.0/16 10.100.0.0/24
     }
 
     log {
diff --git a/modules/20-services-entertainment/wings-service/main.tf b/modules/20-services-entertainment/wings-service/main.tf
index cb1f84d..62a2a0c 100644
--- a/modules/20-services-entertainment/wings-service/main.tf
+++ b/modules/20-services-entertainment/wings-service/main.tf
@@ -46,7 +46,7 @@ module "wings_network" {
   name       = "pelican-wings"
   driver     = "bridge"
   attachable = true
-  subnet     = "172.64.0.0/16"
+  subnet     = "172.18.0.0/16"
   options = {
     "com.docker.network.bridge.name" = "pelican-wings"
   }
diff --git a/modules/30-services-software/authentik-service/main.tf b/modules/30-services-software/authentik-service/main.tf
index 4b4c59b..ed712e9 100644
--- a/modules/30-services-software/authentik-service/main.tf
+++ b/modules/30-services-software/authentik-service/main.tf
@@ -80,7 +80,7 @@ resource "local_file" "authentik_config_file" {
 module "authentik_network" {
   source = "../../01-networking/network-service"
   name   = "authentik-network"
-  subnet = "172.32.0.0/29"
+  subnet = "172.17.0.0/29"
   driver = "bridge"
   options = {
     "isolate" : false
diff --git a/modules/30-services-software/coder-service/main.tf b/modules/30-services-software/coder-service/main.tf
index 3cf53ff..d15e8ef 100644
--- a/modules/30-services-software/coder-service/main.tf
+++ b/modules/30-services-software/coder-service/main.tf
@@ -53,7 +53,7 @@ locals {
 module "coder_network" {
   source = "../../01-networking/network-service"
   name   = "coder-network"
-  subnet = "172.32.0.16/29"
+  subnet = "172.17.0.16/29"
   driver = "bridge"
   options = {
     "isolate" : false
diff --git a/modules/30-services-software/penpot-service/main.tf b/modules/30-services-software/penpot-service/main.tf
index 9288321..1462c8d 100644
--- a/modules/30-services-software/penpot-service/main.tf
+++ b/modules/30-services-software/penpot-service/main.tf
@@ -85,7 +85,7 @@ locals {
 module "penpot_network" {
   source = "../../01-networking/network-service"
   name   = "penpot-network"
-  subnet = "172.32.0.32/29"
+  subnet = "172.17.0.32/29"
   driver = "bridge"
   options = {
     "isolate" : false
diff --git a/modules/30-services-software/tandoor-service/main.tf b/modules/30-services-software/tandoor-service/main.tf
index 6011c0f..bcb812b 100644
--- a/modules/30-services-software/tandoor-service/main.tf
+++ b/modules/30-services-software/tandoor-service/main.tf
@@ -62,7 +62,7 @@ locals {
 module "tandoor_network" {
   source = "../../01-networking/network-service"
   name   = "tandoor-network"
-  subnet = "172.32.0.24/29"
+  subnet = "172.17.0.24/29"
   driver = "bridge"
   options = {
     "isolate" : false
diff --git a/services/main.tf b/services/main.tf
index da8564d..8b930bd 100644
--- a/services/main.tf
+++ b/services/main.tf
@@ -11,7 +11,7 @@ module "system_globals" {
 module "infrastructure_int" {
   source     = "../modules/01-networking/network-service"
   name       = "infrastructure_int"
-  subnet     = "172.16.0.0/12"
+  subnet     = "10.100.0.0/24"
   driver     = "bridge"
   attachable = true
   options = {