Remove 2 files, rename file and move variable

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_api_token      = data.vault_generic_secret.cloudflare.data["api_token"]
-  cloudflare_zone_id    = data.vault_generic_secret.cloudflare.data["zone_id_org"]
   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"]

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" {
+#variable "authentik_oidc_client_id_cloudflare" {
-  description = "Client ID for Authentik"
+#  description = "Client ID for Authentik"
-  type        = string
+#  type        = string
-  default     = "exemple"
+#  default     = "exemple"
-}
+#}
 
-variable "authentik_oidc_secret_cloudflare" {
+#variable "authentik_oidc_secret_cloudflare" {
-  description = "Secret for Authentik"
+#  description = "Secret for Authentik"
-  type        = string
+#  type        = string
-  default     = "exemple"
+#  default     = "exemple"
-}
+#}
 
 # =============================================================================
 # CLOUDFLARE CONFIGURATION
 # =============================================================================
-variable "cloudflare_zone" {
+
-  description = "Domaine principal"
+#variable "cloudflare_zone_id" {
-  type        = string
+#  description = "Domaine principal"
-  default     = "tips-of-mine.org"
+#  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" {
+#variable "cloudflare_api_token" {
-  description = "Token d'API Cloudflare"
+#  description = "Token d'API Cloudflare"
-  type        = string
+#  type        = string
-  sensitive   = true
+#  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