From 786b1d56c07e9fdf5b7d8a0da0005f07c0124be2 Mon Sep 17 00:00:00 2001 From: pierre Date: Thu, 7 Nov 2024 11:53:30 +0000 Subject: [PATCH] add just in case --- terraform/module.tf | 15 +- terraform/nginx_config.tftpl | 1 + terraform/variables.auto.tfvars | 249 +++++++++++++++++++------------- 3 files changed, 159 insertions(+), 106 deletions(-) diff --git a/terraform/module.tf b/terraform/module.tf index 89d89e8..e2366e1 100644 --- a/terraform/module.tf +++ b/terraform/module.tf @@ -14,7 +14,7 @@ variable "nginx_sites" { })) } - +/* resource "local_file" "nginx" { # for_each = var.nginx_sites for_each = { for key, value in var.nginx_sites : key => value if value.enabled == true } @@ -38,7 +38,7 @@ resource "local_file" "nginx" { } } - +*/ #resource "kubernetes_config_map" "automatic-configmap" { # metadata { @@ -67,6 +67,9 @@ resource "kubernetes_config_map" "automatic-configmap" { metadata { name = "sites-terraform" namespace = "reverse-proxy" + annotations = { + "reloader.stakater.com/match" : "true", + } } data = { @@ -82,10 +85,10 @@ resource "kubernetes_config_map" "automatic-configmap" { }) if value.enabled == true } - provisioner "local-exec" { - command = "kubectl get pods -n reverse-proxy -o name | xargs -I{} kubectl delete -n reverse-proxy {}" - quiet = true - } + # provisioner "local-exec" { + # command = "kubectl get pods -n reverse-proxy -o name | xargs -I{} kubectl delete -n reverse-proxy {}" + # quiet = true + # } } diff --git a/terraform/nginx_config.tftpl b/terraform/nginx_config.tftpl index 34e13b4..ff5fffa 100644 --- a/terraform/nginx_config.tftpl +++ b/terraform/nginx_config.tftpl @@ -57,3 +57,4 @@ server { return 404; } + diff --git a/terraform/variables.auto.tfvars b/terraform/variables.auto.tfvars index c22085f..4d8494e 100644 --- a/terraform/variables.auto.tfvars +++ b/terraform/variables.auto.tfvars @@ -1,52 +1,52 @@ nginx_sites = { - bitwarden = { - service = "nginx.bitwarden.svc:8080" - http2_bool = true - } + bitwarden = { + service = "nginx.bitwarden.svc:8080" + http2_bool = true + } - bookstack = { - service = "webserver.bookstack.svc" - proxy_cache = false - } - django = { - service = "webserver.django-python.svc:8000" - proxy_cache = true - http2_bool = true - } - echo = { - service = "echo-server.echo-server.svc:80" - proxy_cache = true - http2_bool = true - } - gitlab = { - service = "webserver.gitlab.svc:443" - proxy_cache = true - extra_value_bool = true - extra-value = <

health check

\n"; } EOT - } + } - router = { - service = "192.168.88.1" - authentication_required = true - } - homeassistant = { - service = "homeassistant.homeassistant.svc:8123" - } - octoprint = { - service = "192.168.1.28:5000" - } - onitama = { - service = "onitama.onitama.svc" - } + router = { + service = "192.168.88.1" + authentication_required = true + } + homeassistant = { + service = "homeassistant.homeassistant.svc:8123" + } + octoprint = { + service = "192.168.1.28:5000" + } + onitama = { + service = "onitama.onitama.svc" + enabled = false + } - opentrashmail = { -# service = "opentrashmail.opentrashmail.svc" - service = "1.1.1.1" - enabled = false - } - paperless-docker = { - service = "192.168.88.50:4887" - } - paperless = { - service = "webserver.paperless.svc:8000" - } - pihole = { - service = "172.16.0.60:8081" - enabled = false - } - portainer = { - service = "portainer.portainer.svc" - } - prowlarr = { - service = "prowlarr.servarr.svc" - } - proxmox = { - service = "192.168.6.2:8006" - enabled = false - } - qbittorrent = { - service = "qbittorrent.servarr.svc:8080" - } - radarr = { - service = "radarr.servarr.svc" - } - reverse = { - service = "192.168.88.50:8888" - enabled = false - } - sickchill = { - service = "sickchill.servarr.svc" - } - transmission = { - service = "192.168.88.52:31091" - enabled = false - } - unifi = { - service = "192.168.88.52:31043" - } - unifi-inform = { - service = "192.168.88.50:8082" - } + opentrashmail = { + # service = "opentrashmail.opentrashmail.svc" + service = "1.1.1.1" + enabled = false + } + paperless-docker = { + service = "192.168.88.50:4887" + } + paperless = { + service = "webserver.paperless.svc:8000" + } + pihole = { + service = "172.16.0.60:8081" + enabled = false + } + portainer = { + service = "portainer.portainer.svc" + } + prowlarr = { + service = "prowlarr.servarr.svc" + } + proxmox = { + service = "192.168.6.2:8006" + enabled = false + } + qbittorrent = { + service = "qbittorrent.servarr.svc:8080" + } + radarr = { + service = "radarr.servarr.svc" + } + reverse = { + service = "192.168.88.50:8888" + enabled = false + } + sickchill = { + service = "sickchill.servarr.svc" + } + transmission = { + service = "192.168.88.52:31091" + enabled = false + } + unifi = { + service = "192.168.88.52:31043" + } + unifi-inform = { + service = "192.168.88.50:8082" + } + dupeguru = { + service = "dupeguru.dupeguru.svc:5800" + authentication_required = true + } + immich = { + service = "immich-server.immich.svc:3001" + } + netdata = { + enabled = false + service = "netdata-agent.netdata.svc:19999" + } + screeps = { + enabled = false + service = "screeps.screeps.svc:21025" + } + vulcan = { + service = "vulcan.vulcan.svc:80" + enabled = false + } + djangoterra = { + enabled = false + service = "djangoterra-svc.djangoterra.svc:8000" + } + nginx = { + enabled = false + service = "nginx-svc.nginx.svc" + } + openmediavault = { + service = "192.168.88.42" + } + pihole = { + service = "web.piholenew.svc" + } + jellyfin = { + service = "jellyfin.jellyfin.svc:8096" + } + gogs = { + enabled = false + service = "gogs-svc.gogs.svc:3000" + } + synology = { + enabled = true + service = "192.168.88.39:5001" + } + gitea = { + enabled = true + service = "webserver.gitea.svc:3000" + } }