diff --git a/terraform/gandi.tf b/terraform/gandi.tf deleted file mode 100644 index 8f268b9..0000000 --- a/terraform/gandi.tf +++ /dev/null @@ -1,11 +0,0 @@ -# FIXME: Not declared because needs the owners block and so would require us -# to expose personal mail addresses to the public. -# -# resource "gandi_domain" "nix_community" { -# name = "nix-community.org" -# } - -resource "gandi_email_forwarding" "admin" { - source = "admin@nix-community.org" - destinations = values(local.admins) -} diff --git a/terraform/secrets.yaml b/terraform/secrets.yaml index 7db8a63..96d4d64 100644 --- a/terraform/secrets.yaml +++ b/terraform/secrets.yaml @@ -1,8 +1,6 @@ CLOUDFLARE_API_TOKEN: ENC[AES256_GCM,data:RCXy2ccuRjpLqrbqy6Xx3ZA6XO4ZgKKyK3vrl3WgeclRelrxZxOmhA==,iv:uyiU9UC2l8nm6tCcyuDa8Psk+bf4hyi5yruc+Q0jd9s=,tag:bpHTP7nJi58fu3TxJ+jcIA==,type:str] HYDRA_PASSWORD: ENC[AES256_GCM,data:7o8RuTWxYY7HNbMDgl9ur0j+ehI1bf0JSA==,iv:oZ6iHGGL4xbCC54kQ+mjpYYrm3Kn2PAlhDOyX8K6VCY=,tag:hXSlJSgjQymbsriHBiMy4w==,type:str] TFE_TOKEN: ENC[AES256_GCM,data:OiC6uMy/ilF3v/4cI0boZh7jYkVFwyeIASukif3d6PlWkIUkPonCbXmTXOcp+tpuCg7KzJC7r/bwsSM1BlFmCjXwOs7oeRK5sfNg+a071CEZnHpkMTgdwEqU,iv:mHIn4vwLS4oTYrhDVlmGbG0yzYrhcFbizIevGDIoaAs=,tag:UhKQ8w8Hk2POnZnr7BCBTg==,type:str] -GANDI_KEY: ENC[AES256_GCM,data:PcHp8fcxIMCtSKlwAs3xYkJ6WVZ6/k65,iv:Ve+Lx7QuaVuv7jcBD0g+DBH2eCXi19acrYwtrPA9l9g=,tag:SUNzK8p5pJY972Phcoeomg==,type:str] -GANDI_SHARING_ID: ENC[AES256_GCM,data:635hSpyHifVPk+EP0yy4DmVVvmH+zQWVUfkJzvzmyu+UXvWV,iv:LyXWKmIb3ThPMH3KkzYkk6r4QAb7kWWaflhQYcWc2pw=,tag:LvtAmeDhMDv+AVDN07O7oA==,type:str] sops: kms: [] gcp_kms: [] @@ -54,8 +52,8 @@ sops: aUhpWnU2eHdQY2NjaEZPNWNPeVlhYjgKV4lec3/DD7lrt11Cut9YRzQqnSFiRkII mrrs8Y0NrX7hibd5skmMXdgkPNna8EotkUHbWq1qg5qO/D+AamsSCA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-06-01T23:41:51Z" - mac: ENC[AES256_GCM,data:XFbeS4w5FP7uL6lry+Vubkwu1vWXO6SbMf8f5eI2lSkRBw9C4awdijyQpM56SO07RNgUj+PkPpx4GvNSWnCpSy04YrH6aErcvO7FqbVFlIUQXIdMgM3ZdZum0+SXIP/AjUArfKiq3+3VxcEGMuDMjuohoBffnyjKRLnMvaSuMlQ=,iv:HPhNL8m/kAho9J3C+4FKljbJXSmVvvC527Uu8F1pjDU=,tag:D7jfGYpoNLjwRYgdRR8QNA==,type:str] + lastmodified: "2024-01-10T20:48:42Z" + mac: ENC[AES256_GCM,data:bWP5cXQMQT5NCoS8z3Z1rDIrs7ahpOFNXUhHZlHg9X/kC8MECK8/4gG8ZRTs+5MNbpN/Vm5GJkCffMHzDDwG0ltGszy6Q7k3m0eYdkHS3/I1O0s8vzdF2/2hc9794GpUj1DuiIULsQfJJ6YemmZsXpDzepzkugXvU83rmqB7Lw0=,iv:hLFJsFqI+iTxivPLE2sN0Cc/qkGyNvmisR1BXOuLazg=,tag:54czUgcOhdOdXpvT+haNOA==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.7.3 + version: 3.8.1 diff --git a/terraform/shell.nix b/terraform/shell.nix index 7e7f964..3f2885b 100644 --- a/terraform/shell.nix +++ b/terraform/shell.nix @@ -9,7 +9,6 @@ in (terraform'.withPlugins (p: [ p.cloudflare p.external - p.gandi p.hydra p.null p.sops diff --git a/terraform/terraform_providers.tf b/terraform/terraform_providers.tf index cee427c..30cf557 100644 --- a/terraform/terraform_providers.tf +++ b/terraform/terraform_providers.tf @@ -3,9 +3,6 @@ terraform { cloudflare = { source = "cloudflare/cloudflare" } - gandi = { - source = "go-gandi/gandi" - } hydra = { source = "DeterminateSystems/hydra" } @@ -26,11 +23,6 @@ provider "cloudflare" { api_token = data.sops_file.nix-community.data["CLOUDFLARE_API_TOKEN"] } -provider "gandi" { - key = data.sops_file.nix-community.data["GANDI_KEY"] - sharing_id = data.sops_file.nix-community.data["GANDI_SHARING_ID"] -} - provider "hydra" { host = "https://hydra.nix-community.org" password = data.sops_file.nix-community.data["HYDRA_PASSWORD"]