diff --git a/nixos/systems/blowhole/default.nix b/nixos/systems/blowhole/default.nix index 5a7aeda..0437c80 100644 --- a/nixos/systems/blowhole/default.nix +++ b/nixos/systems/blowhole/default.nix @@ -33,7 +33,7 @@ in # ./hostapd.nix ./ical2org.nix ./klipper.nix - ./monitoring.nix + # ./monitoring.nix ./nas.nix ./networking.nix ./nfs.nix diff --git a/terranix/blowhole.nix b/terranix/blowhole.nix index e0a0746..dc45eb8 100644 --- a/terranix/blowhole.nix +++ b/terranix/blowhole.nix @@ -51,6 +51,14 @@ in }; }; + # path "${vaultConsulMount}/creds/${tf "module.blowhole.envoy_grafana.name"}" { + # capabilities = ["read"] + # } + + # path "${vaultConsulMount}/creds/${tf "module.blowhole.envoy_blowhole.name"}" { + # capabilities = ["read"] + # } + resource."vault_policy"."vault-agent-blowhole" = { name = "blowhole-id_ed_camera"; @@ -67,14 +75,6 @@ in capabilities = ["read"] } - path "${vaultConsulMount}/creds/${tf "module.blowhole.envoy_grafana.name"}" { - capabilities = ["read"] - } - - path "${vaultConsulMount}/creds/${tf "module.blowhole.envoy_blowhole.name"}" { - capabilities = ["read"] - } - path "${vaultConsulMount}/creds/${tf "module.blowhole.envoy_klipper.name"}" { capabilities = ["read"] } diff --git a/terranix/default.nix b/terranix/default.nix index 83c3447..c0a0c26 100644 --- a/terranix/default.nix +++ b/terranix/default.nix @@ -34,9 +34,9 @@ in address = "http://nomad.in.redalder.org:4646"; }; - provider."influxdb-v2" = { - url = "http://influx.in.redalder.org"; - }; + # provider."influxdb-v2" = { + # url = "http://influx.in.redalder.org"; + # }; variable."hcloud_token" = { sensitive = true; @@ -86,10 +86,10 @@ in source = ./containers/ingress-blowhole; }; - module."ingress-toothpick" = elib.terraformModule { - name = "ingress-toothpick"; - source = ./containers/ingress-toothpick; - }; + # module."ingress-toothpick" = elib.terraformModule { + # name = "ingress-toothpick"; + # source = ./containers/ingress-toothpick; + # }; module."gateway-mesh" = elib.terraformModule { name = "gateway-mesh"; @@ -116,11 +116,6 @@ in # source = ./containers/minecraft/ftb-integrations; # }; - module."altra" = elib.terraformModule { - name = "altra"; - source = ./altra.nix; - }; - imports = [ ./lib ./modules/push_approles.nix @@ -129,6 +124,7 @@ in ./pki.nix ./blowhole.nix ./toothpick.nix + ./altra.nix ]; terraform.backend."consul" = { @@ -137,10 +133,10 @@ in path = "terraform/dotfiles"; }; - terraform.required_providers = { - hcloud.source = "hetznercloud/hcloud"; - influxdb-v2.source = "MagicRB/influxdb-v2"; - }; + # terraform.required_providers = { + # hcloud.source = "hetznercloud/hcloud"; + # influxdb-v2.source = "MagicRB/influxdb-v2"; + # }; resource."vault_auth_backend"."approle" = { type = "approle";