Remove services not in active use

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).

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 {

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"
   }

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

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

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

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

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"

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,
   ]
 }