Upgrade trunk

.trunk/trunk.yaml

@@ -7,7 +7,7 @@ cli:
 plugins:
   sources:
     - id: trunk
-      ref: v1.6.1
+      ref: v1.6.0
       uri: https://github.com/trunk-io/plugins
 # Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
 runtimes:
@@ -49,9 +49,9 @@ tools:
     - gh@2.49.2
     - jq@jq-1.7.1
     - yq@4.44.1
-    - awscli@1.33.27
+    - awscli@1.33.26
     - action-validator@0.6.0
-    - act@0.2.63
+    - act@0.2.64
     - shellcheck@0.10.0
     - hadolint@2.12.0
     - tofu@1.7.2

mitmproxy.tf_

@@ -1,44 +0,0 @@
-data "docker_registry_image" "mitmproxy" {
-  name = "ghcr.io/benzine-framework/mitmproxy:10.1.1"
-}
-resource "docker_service" "mitmproxy" {
-  name = "mitmproxy"
-  task_spec {
-    container_spec {
-      image = "${data.docker_registry_image.mitmproxy.name}@${data.docker_registry_image.mitmproxy.sha256_digest}"
-      command = [
-        "mitmweb",
-        "--web-host", "0.0.0.0",
-        "--web-port", "8081",
-        #"--listen-host", "0.0.0.0",
-        #"--listen-port", "8080",
-        "--ssl-insecure",
-      ]
-      #healthcheck {
-      #  test         = ["CMD-SHELL", " curl -I -x http://localhost:8080 -k http://172.17.0.1 || exit 1"]
-      #  start_period = "10s"
-      #  interval     = "10s"
-      #  timeout      = "5s"
-      #  retries      = 5
-      #}
-    }
-    restart_policy {
-      condition = "any"
-      delay     = "0s"
-      window    = "0s"
-    }
-  }
-  endpoint_spec {
-    ports {
-      target_port    = 8081
-      published_port = 8081
-      publish_mode   = "ingress"
-    }
-    ports {
-        target_port    = 8080
-        published_port = 8080
-        publish_mode   = "ingress"
-    }
-  }
-}
-

modules/vigil/configuration.tf

@@ -21,7 +21,6 @@ locals {
     custom_html          = var.custom_html
     services             = local.services_toml
     startup_notification = var.notify_on_startup
-    telegram_enable      = var.notify_telegram.token == "" ? "# " : "" // Disable telegram if token is not set
     telegram_bot_token   = var.notify_telegram.token
     telegram_chat_id     = var.notify_telegram.channel
   })

modules/vigil/vigil.toml.tpl

@@ -59,9 +59,9 @@ reminder_interval = 600
 reminder_backoff_function = "linear"
 reminder_backoff_limit = 3
 
-${telegram_enable}[notify.telegram]
-${telegram_enable}bot_token = "${telegram_bot_token}"
-${telegram_enable}chat_id = "${telegram_chat_id}"
+[notify.telegram]
+bot_token = "${telegram_bot_token}"
+chat_id = "${telegram_chat_id}"
 
 [probe]
 

vigil.tf

@@ -11,15 +11,12 @@ module "vigil_nginx_config" {
 }
 variable "telegram_token" {
   type = string
-  default = ""
 }
 variable "telegram_channel" {
   type = string
-  default = ""
 }
 variable "telegram_topic" {
   type = string
-  default = ""
 }
 module "vigil" {
   source = "./modules/vigil"
@@ -70,30 +67,6 @@ module "vigil" {
         ]
       },
     ]
-    "PDUs" = [
-      {
-        id = "pdu-main"
-        label = "PDU Main Space"
-        endpoints = [
-          "icmp://main.pdu.ti",
-          "tcp://main.pdu.ti:23",
-        ]
-      },{
-        id = "pdu-aux"
-        label = "PDU Aux Space"
-        endpoints = [
-          "icmp://aux.pdu.ti",
-          "tcp://aux.pdu.ti:23",
-        ]
-      },{
-        id = "pdu-printers"
-        label = "PDU Printers"
-        endpoints = [
-          "icmp://printer.pdu.ti",
-          "tcp://printer.pdu.ti:23",
-        ]
-      }
-    ]
     "Wifi" = [
       {
         id    = "unifi-controller"