diff --git a/modules/kubernetes/headscale/main.tf b/modules/kubernetes/headscale/main.tf index 28743030..365ba44d 100644 --- a/modules/kubernetes/headscale/main.tf +++ b/modules/kubernetes/headscale/main.tf @@ -100,21 +100,21 @@ resource "kubernetes_deployment" "headscale" { # } # } container { - # image = "ghcr.io/gurucomputing/headscale-ui:latest" - image = "ghcr.io/tale/headplane:0.3.2" - name = "headscale-ui" + image = "ghcr.io/gurucomputing/headscale-ui:latest" + # image = "ghcr.io/tale/headplane:0.3.2" + name = "headscale-ui" port { - # container_port = 8081 - container_port = 3000 + container_port = 8081 + # container_port = 3000 } env { name = "HTTP_PORT" value = "8081" } - env { - name = "HTTPS_PORT" - value = "8082" - } + # env { + # name = "HTTPS_PORT" + # value = "8082" + # } env { name = "HEADSCALE_URL" value = "http://localhost:8080" @@ -161,11 +161,11 @@ resource "kubernetes_service" "headscale" { protocol = "TCP" } port { - name = "headscale-ui" - port = "80" - # target_port = 8081 - target_port = 3000 - protocol = "TCP" + name = "headscale-ui" + port = "80" + target_port = 8081 + # target_port = 3000 + protocol = "TCP" } port { name = "metrics" @@ -196,13 +196,13 @@ resource "kubernetes_ingress_v1" "headscale" { host = "headscale.viktorbarzin.me" http { path { - # path = "/web" - path = "/admin" + path = "/web" + # path = "/admin" backend { service { name = "headscale" port { - number = 80 + number = 8081 } } } diff --git a/modules/kubernetes/nginx-ingress/main.tf b/modules/kubernetes/nginx-ingress/main.tf index 63b6634a..3f3e283e 100644 --- a/modules/kubernetes/nginx-ingress/main.tf +++ b/modules/kubernetes/nginx-ingress/main.tf @@ -472,27 +472,28 @@ resource "kubernetes_deployment" "ingress_nginx_controller" { name = "MODE" value = "stream" } + # env { + # name = "CAPTCHA_PROVIDER" + # value = "recaptcha" + # } env { - name = "CAPTCHA_PROVIDER" - value = "recaptcha" - } - env { - name = "BOUNCING_ON_TYPE" - value = "all" - } - env { - name = "SECRET_KEY" - value = var.crowdsec_captcha_secret_key - } - env { - name = "SITE_KEY" - value = var.crowdsec_captcha_site_key + name = "BOUNCING_ON_TYPE" + # value = "all" + value = "ban" } + # env { + # name = "SECRET_KEY" + # value = var.crowdsec_captcha_secret_key + # } + # env { + # name = "SITE_KEY" + # value = var.crowdsec_captcha_site_key + # } - env { - name = "DISABLE_RUN" - value = "true" - } + # env { + # name = "DISABLE_RUN" + # value = "true" + # } env { name = "BAN_TEMPLATE_PATH" value = "/etc/nginx/lua/plugins/crowdsec/templates/ban.html" diff --git a/modules/kubernetes/reverse_proxy/main.tf b/modules/kubernetes/reverse_proxy/main.tf index 0d8fcd6d..e23dba80 100644 --- a/modules/kubernetes/reverse_proxy/main.tf +++ b/modules/kubernetes/reverse_proxy/main.tf @@ -205,7 +205,6 @@ module "ha-london" { external_name = "ha-london.viktorbarzin.lan" port = 8123 tls_secret_name = var.tls_secret_name - proxy_timeout = 360 depends_on = [kubernetes_namespace.reverse-proxy] } diff --git a/terraform.tfstate b/terraform.tfstate index fa260536..e282f85e 100644 Binary files a/terraform.tfstate and b/terraform.tfstate differ