From c0b0eae7cf9918a743101f8709f46a81d5ca8cdf Mon Sep 17 00:00:00 2001
From: Thomas Way <thomas@6f.io>
Date: Mon, 23 Oct 2023 20:38:07 +0100
Subject: [PATCH] tf: sync

---
 tf/io_6f.tf          |  8 ++++++++
 tf/main.tf           | 24 ------------------------
 tf/net_hipparchus.tf |  8 ++++++++
 tf/net_hipparcos.tf  |  8 ++++++++
 tf/net_starjunk.tf   | 27 +++++++++++++++++++++++++--
 5 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/tf/io_6f.tf b/tf/io_6f.tf
index 23e6ca6eb..034693e8b 100644
--- a/tf/io_6f.tf
+++ b/tf/io_6f.tf
@@ -1,3 +1,11 @@
+resource "cloudflare_zone" "terraform_managed_resource_897af3a08a43f0b90fc93479c2b8ef41" {
+  account_id = "cde22999fc6fe2ed5c9605561c508d29"
+  paused     = false
+  plan       = "enterprise"
+  type       = "full"
+  zone       = "6f.io"
+}
+
 resource "cloudflare_record" "terraform_managed_resource_db96d0c2bd7972625be5edfb3c5bffe9" {
   name    = "6f.io"
   proxied = true
diff --git a/tf/main.tf b/tf/main.tf
index 372e147ce..32f4c0e62 100644
--- a/tf/main.tf
+++ b/tf/main.tf
@@ -10,27 +10,3 @@ terraform {
 provider "cloudflare" {
   api_token = var.cloudflare_api_token
 }
-
-resource "cloudflare_zone" "starjunk_net" {
-  account_id = var.cloudflare_account_id
-  zone = var.cloudflare_zone
-  plan = "business"
-  type = "full"
-}
-
-resource "cloudflare_certificate_pack" "advanced_digicert_certificate_pack" {
-  zone_id = cloudflare_zone.starjunk_net.id
-  type    = "advanced"
-  hosts = [
-    cloudflare_zone.starjunk_net.zone,
-    "*.${cloudflare_zone.starjunk_net.zone}",
-  ]
-  validation_method     = "txt"
-  validity_days         = 30
-  certificate_authority = "digicert"
-  cloudflare_branding   = false
-
-  lifecycle {
-    create_before_destroy = true
-  }
-}
diff --git a/tf/net_hipparchus.tf b/tf/net_hipparchus.tf
index f7bc3691d..35169631e 100644
--- a/tf/net_hipparchus.tf
+++ b/tf/net_hipparchus.tf
@@ -1,3 +1,11 @@
+resource "cloudflare_zone" "terraform_managed_resource_8e603296b42075dc4f1754b63f2ce5de" {
+  account_id = "cde22999fc6fe2ed5c9605561c508d29"
+  paused     = false
+  plan       = "free"
+  type       = "full"
+  zone       = "hipparchus.net"
+}
+
 resource "cloudflare_record" "terraform_managed_resource_d51aea2d5e1c71a0643f272d4f7c0b04" {
   name    = "_dmarc"
   proxied = false
diff --git a/tf/net_hipparcos.tf b/tf/net_hipparcos.tf
index c76534cfa..7553c7f74 100644
--- a/tf/net_hipparcos.tf
+++ b/tf/net_hipparcos.tf
@@ -1,3 +1,11 @@
+resource "cloudflare_zone" "terraform_managed_resource_994692a638e9a8c4ae552a9e6dacb609" {
+  account_id = "cde22999fc6fe2ed5c9605561c508d29"
+  paused     = false
+  plan       = "free"
+  type       = "full"
+  zone       = "hipparcos.net"
+}
+
 resource "cloudflare_record" "terraform_managed_resource_b861a72f5625b9e60f2610c85b08501b" {
   name    = "fm1._domainkey"
   proxied = false
diff --git a/tf/net_starjunk.tf b/tf/net_starjunk.tf
index 0b1a07b13..81375500e 100644
--- a/tf/net_starjunk.tf
+++ b/tf/net_starjunk.tf
@@ -1,3 +1,16 @@
+moved {
+  from = cloudflare_zone.terraform_managed_resource_acff21a4b43636283cd28bd5c5bd44a5
+  to = cloudflare_zone.starjunk_net
+}
+
+resource "cloudflare_zone" "starjunk_net" {
+  account_id = "cde22999fc6fe2ed5c9605561c508d29"
+  paused     = false
+  plan       = "business"
+  type       = "full"
+  zone       = "starjunk.net"
+}
+
 resource "cloudflare_record" "terraform_managed_resource_eedd8ec4c36e120ef1fc65c829c9bbc6" {
   name    = "amour"
   proxied = false
@@ -43,7 +56,12 @@ resource "cloudflare_record" "terraform_managed_resource_8c0fbc31ad098d40f9eccb8
   zone_id = "acff21a4b43636283cd28bd5c5bd44a5"
 }
 
-resource "cloudflare_record" "terraform_managed_resource_96ab3ddbd1d6bda8e41ad733053b18aa" {
+moved {
+  from = cloudflare_record.terraform_managed_resource_96ab3ddbd1d6bda8e41ad733053b18aa
+  to = cloudflare_record.aaaa
+}
+
+resource "cloudflare_record" "aaaa" {
   name    = "starjunk.net"
   proxied = true
   ttl     = 1
@@ -52,7 +70,12 @@ resource "cloudflare_record" "terraform_managed_resource_96ab3ddbd1d6bda8e41ad73
   zone_id = "acff21a4b43636283cd28bd5c5bd44a5"
 }
 
-resource "cloudflare_record" "terraform_managed_resource_1d02e7ffa92156a8528ad4263f5462c0" {
+moved {
+  from = cloudflare_record.terraform_managed_resource_1d02e7ffa92156a8528ad4263f5462c0
+  to = cloudflare_record.www_aaaa
+}
+
+resource "cloudflare_record" "www_aaaa" {
   name    = "www"
   proxied = true
   ttl     = 1