From 0b99fe232f9452cc6d751157b4e3c3d07ce3bf90 Mon Sep 17 00:00:00 2001 From: hcornet Date: Thu, 20 Nov 2025 10:21:24 +0100 Subject: [PATCH] Remove 2 files, rename file and move variable --- ....tf => Networks-Routes-Virtual_Networks.tf | 0 main.tf | 4 +- test.tf => test.tf.old | 0 test02.tf => test02.tf.old | 0 variables.tf | 66 ++++++++++--------- 5 files changed, 38 insertions(+), 32 deletions(-) rename Networks-Routes-Virtual_Networks.tf.tf => Networks-Routes-Virtual_Networks.tf (100%) rename test.tf => test.tf.old (100%) rename test02.tf => test02.tf.old (100%) diff --git a/Networks-Routes-Virtual_Networks.tf.tf b/Networks-Routes-Virtual_Networks.tf similarity index 100% rename from Networks-Routes-Virtual_Networks.tf.tf rename to Networks-Routes-Virtual_Networks.tf diff --git a/main.tf b/main.tf index f94aa0c..ba57992 100644 --- a/main.tf +++ b/main.tf @@ -14,9 +14,9 @@ data "vault_generic_secret" "authentik" { # ============================================================================= locals { # Secrets Cloudflare depuis Vault - cloudflare_token = data.vault_generic_secret.cloudflare.data["api_token"] - cloudflare_zone_id = data.vault_generic_secret.cloudflare.data["zone_id_org"] + cloudflare_api_token = data.vault_generic_secret.cloudflare.data["api_token"] cloudflare_account_id = data.vault_generic_secret.cloudflare.data["account_id"] + cloudflare_zone_id = data.vault_generic_secret.cloudflare.data["zone_id_org"] cloudflare_email = data.vault_generic_secret.cloudflare.data["email"] authentik_oidc_client_id_cloudflare = data.vault_generic_secret.authentik.data["client_id_cloudflare"] diff --git a/test.tf b/test.tf.old similarity index 100% rename from test.tf rename to test.tf.old diff --git a/test02.tf b/test02.tf.old similarity index 100% rename from test02.tf rename to test02.tf.old diff --git a/variables.tf b/variables.tf index e3f30b2..44ff993 100644 --- a/variables.tf +++ b/variables.tf @@ -1,6 +1,7 @@ # ============================================================================= -# VAULT CONFIGURATION +# CONFIGURATION : VAULT SETTINGS # ============================================================================= + variable "vault_url" { description = "URL du serveur Vault" type = string @@ -26,29 +27,30 @@ variable "vault_authentik_path" { } # ============================================================================= -# CLOUDFLARE CONFIGURATION +# CLOUDFLARE CONFIGURATION : AUTHENTIK SETTINGS # ============================================================================= -variable "authentik_oidc_client_id_cloudflare" { - description = "Client ID for Authentik" - type = string - default = "exemple" -} +#variable "authentik_oidc_client_id_cloudflare" { +# description = "Client ID for Authentik" +# type = string +# default = "exemple" +#} -variable "authentik_oidc_secret_cloudflare" { - description = "Secret for Authentik" - type = string - default = "exemple" -} +#variable "authentik_oidc_secret_cloudflare" { +# description = "Secret for Authentik" +# type = string +# default = "exemple" +#} # ============================================================================= # CLOUDFLARE CONFIGURATION # ============================================================================= -variable "cloudflare_zone" { - description = "Domaine principal" - type = string - default = "tips-of-mine.org" -} + +#variable "cloudflare_zone_id" { +# description = "Domaine principal" +# type = string +# default = "tips-of-mine.org" +#} variable "tunnel_name" { description = "Nom du tunnel Cloudflare" @@ -68,20 +70,31 @@ variable "tunnel_network_comment" { default = "tips-of-mine comment for this route." } -variable "cloudflare_api_token" { - description = "Token d'API Cloudflare" - type = string - sensitive = true -} +#variable "cloudflare_api_token" { +# description = "Token d'API Cloudflare" +# type = string +# sensitive = true +#} variable "cloudflare_access_tags" { type = list(string) description = "Liste des tags Cloudflare Zero Trust à créer" } +variable "cloudflare_email_domain" { + description = "Email Domain used for email authentication in App policies" + type = string +} + +variable "cloudflare_team_name" { + description = "Name of the Team in Cloudflare, essentially zero-trust org name" + type = string +} + # ============================================================================= # APPLICATIONS CONFIGURATION # ============================================================================= + variable "applications" { description = "Liste des applications à exposer via le tunnel" type = map(object({ @@ -207,10 +220,6 @@ variable "cloudflare_device_os" { type = string } -variable "cloudflare_email_domain" { - description = "Email Domain used for email authentication in App policies" - type = string -} #====================================================== # OKTA SAML GROUPS @@ -449,10 +458,7 @@ variable "cloudflare_tunnel_warp_connector_ovh_id" { type = string } -variable "cloudflare_team_name" { - description = "Name of the Team in Cloudflare, essentially zero-trust org name" - type = string -} + #====================================================== # CLOUDFLARE DNS SUBDOMAIN CONFIGURATION