From a119b970e8aa17cd788be339041e1787e86c65be Mon Sep 17 00:00:00 2001 From: Jeroen Vijgen Date: Fri, 27 Mar 2026 20:49:21 +0000 Subject: [PATCH] Remove services not in active use --- README.md | 6 ++--- modules/01-networking/caddy-service/main.tf | 2 +- .../wings-service/main.tf | 2 +- .../authentik-service/main.tf | 2 +- .../coder-service/main.tf | 2 +- .../penpot-service/main.tf | 2 +- .../tandoor-service/main.tf | 2 +- services/main.tf | 26 +------------------ services/outputs.tf | 4 --- 9 files changed, 10 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 56792d9..a38be5c 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,8 @@ homelab/ For the global network I use the following IP range and Subnet: -- 10.100.0.0 - 10.100.0.254 -- 255.255.255.0 (/24) +- 172.16.0.0 - 172.16.252.252 +- 255.255.0.0 (/12) 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.16.0.0 - 172.16.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 be52dac..3fd2597 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 10.100.0.0/24 + trusted_proxies static 172.16.0.0/12 10.0.0.0/8 192.168.0.0/16 } log { diff --git a/modules/20-services-entertainment/wings-service/main.tf b/modules/20-services-entertainment/wings-service/main.tf index dea4b93..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.17.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 f0dfa59..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.16.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 5f1d89f..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.16.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 d7379fa..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.16.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 8c1bea4..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.16.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 fd92099..da8564d 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 = "10.100.0.0/24" + subnet = "172.16.0.0/12" driver = "bridge" attachable = true options = { @@ -25,18 +25,6 @@ module "jellyfin" { networks = [module.infrastructure_int.name] } -module "calibre" { - source = "${local.module_dir}/20-services-entertainment/calibre-service" - volume_path = "${local.root_volume}/calibre" - networks = [module.infrastructure_int.name] -} - -module "pelican" { - source = "${local.module_dir}/20-services-entertainment/pelican-service" - volume_path = "${local.root_volume}/pelican" - networks = [module.infrastructure_int.name] -} - module "authentik" { source = "${local.module_dir}/30-services-software/authentik-service" volume_path = "${local.root_volume}/authentik" @@ -55,24 +43,12 @@ module "tandoor" { networks = [module.infrastructure_int.name] } -module "qbittorrent" { - source = "${local.module_dir}/30-services-software/qbittorrent-service" - volume_path = "${local.root_volume}/qbittorrent" - networks = [module.infrastructure_int.name] -} - module "coder" { source = "${local.module_dir}/30-services-software/coder-service" volume_path = "${local.root_volume}/coder" networks = [module.infrastructure_int.name] } -module "actualbudget" { - source = "${local.module_dir}/30-services-software/actualbudget-service" - volume_path = "${local.root_volume}/actualbudget" - networks = [module.infrastructure_int.name] -} - module "penpot" { source = "${local.module_dir}/30-services-software/penpot-service" volume_path = "${local.root_volume}/penpot" diff --git a/services/outputs.tf b/services/outputs.tf index 4a0cd8e..099efb5 100644 --- a/services/outputs.tf +++ b/services/outputs.tf @@ -2,14 +2,10 @@ output "service_definitions" { description = "Service definitions for all services" value = [ module.jellyfin.service_definition, - module.calibre.service_definition, - module.pelican.service_definition, module.authentik.service_definition, module.traccar.service_definition, module.tandoor.service_definition, - module.qbittorrent.service_definition, module.coder.service_definition, - module.actualbudget.service_definition, module.penpot.service_definition, ] }