diff --git a/config.yaml b/config.yaml deleted file mode 100644 index 1900c846..00000000 --- a/config.yaml +++ /dev/null @@ -1,81 +0,0 @@ -zones: - inskip: - name: inskip.me - records: - - kind: caa - flags: 0 - tag: iodef - value: mailto:acme@inskip.me - - kind: cname - value: inskip-root.pages.dev - - kind: caa - flags: 0 - tag: issue - value: letsencrypt.org - - kind: caa - flags: 0 - tag: issuewild - value: ; - - kind: txt - value: v=spf1 include:_spf.google.com -all - - kind: mx - priority: 1 - value: aspmx.l.google.com - - kind: txt - name: google._domainkey - value: v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkxag/EmXQ89XQmLrBDPpPtZ7EtEJT0hgvWf/+AFiOfBOm902tq9NbTTvRJ2dLeBLPaV+hNvq2Alc7UfkKUDlLTWQjeuiC6aOnRKQQg3LZ2W25U3AlIj0jd2IPiUhg9JGV4c66XiqQ5ylTBniShfUUyeAXxbPhYFBCkBg62LZcO/tFpFsdKWtZzLjgac5vTJID+M4F8duHpkA/ZCNNUEmtt7RNQB/LLI1Gr5yR4GdQl9z7NmwtOTo9pghbZuvljr8phYjdDrwZeFTMKQnvR1l2Eh/dZ8I0C4nP5Bk4QEfmLq666P1HzOxwT6iCU6Tc+P/pkWbrx0HJh39E1aKGyLJMQIDAQAB - - kind: mx - priority: 5 - value: alt1.aspmx.l.google.com - - kind: mx - priority: 5 - value: alt2.aspmx.l.google.com - - kind: mx - priority: 10 - value: alt3.aspmx.l.google.com - - kind: mx - priority: 10 - value: alt4.aspmx.l.google.com - - kind: mx - priority: 15 - value: 6uyykkzhqi4zgogxiicbuamoqrxajwo5werga4byh77b2iyx3wma.mx-verification.google.com - dork: - name: dork.dev - records: - - kind: txt - name: google._domainkey - value: v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAziwoHJbM1rmeUiIXOgg0cujTL5BFW9PQOksUhKza1XpDP2rpzTlQr21NFYMJMc08xiE3AbvScMTX0jX3gc7+XoIYLD1VigRRvkyTubVfRmatqj+Pk41Fle1jWXHv5vNIYjjcsUTrpnrXYKoYrz34TtsmYHnu0G9MgmmcQGmbRU+WY+1R/ukhavlgXasfEW6r4tjLgVxQnser1Zjr80AUcu23od/+o+m6C9rDGMMnv6NIc2DOT7Ei6o60458f2Iwcpg38te22dy46A8AeGynbpB9+jF33Se0m22eKk5qZN5mfju/wxWMsl7ifCY/eqLZXRxJaEd5bMI8px5KvZp1TWwIDAQAB - gensokyo: - name: gensokyo.zone - kittywitch: - name: kittywit.ch - records: - - kind: a - name: marisa - value: 104.244.72.5 - - kind: aaaa - name: marisa - value: 2605:6400:30:eed1:6cf7:bbfc:b4e:15c0 - - kind: a - name: daiyousei - value: 132.145.26.5 - - kind: aaaa - name: daiyousei - value: 2603:c020:c004:6f00::6 - - kind: cname - name: irc - value: daiyousei.kittywit.ch - - kind: cname - name: auth - value: daiyousei.kittywit.ch - - kind: cname - name: vault - value: daiyousei.kittywit.ch - - kind: cname - name: files - value: daiyousei.kittywit.ch - - kind: cname - name: znc - value: daiyousei.kittywit.ch - - kind: cname - value: daiyousei.kittywit.ch \ No newline at end of file diff --git a/cf-zones.tf b/tf/cloudflare-zones.tf similarity index 100% rename from cf-zones.tf rename to tf/cloudflare-zones.tf diff --git a/cf-provider.tf b/tf/cloudflare.tf similarity index 100% rename from cf-provider.tf rename to tf/cloudflare.tf diff --git a/cf-gensokyo.zone-tunnel.tf b/tf/gensokyo.tf similarity index 100% rename from cf-gensokyo.zone-tunnel.tf rename to tf/gensokyo.tf diff --git a/gmail-dns/cf-provider.tf b/tf/gmail-dns/cf-provider.tf similarity index 88% rename from gmail-dns/cf-provider.tf rename to tf/gmail-dns/cf-provider.tf index 5eec5cc8..c40565eb 100644 --- a/gmail-dns/cf-provider.tf +++ b/tf/gmail-dns/cf-provider.tf @@ -1,5 +1,5 @@ terraform { - required_providers { + required_providers { cloudflare = { source = "cloudflare/cloudflare" version = "4.4.0" diff --git a/gmail-dns/main.tf b/tf/gmail-dns/main.tf similarity index 100% rename from gmail-dns/main.tf rename to tf/gmail-dns/main.tf diff --git a/gmail-dns/variables.tf b/tf/gmail-dns/variables.tf similarity index 100% rename from gmail-dns/variables.tf rename to tf/gmail-dns/variables.tf diff --git a/gmail.tf b/tf/gmail.tf similarity index 97% rename from gmail.tf rename to tf/gmail.tf index 99244d7a..60a951fc 100644 --- a/gmail.tf +++ b/tf/gmail.tf @@ -2,7 +2,7 @@ locals { dkims = { inskip = "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkxag/EmXQ89XQmLrBDPpPtZ7EtEJT0hgvWf/+AFiOfBOm902tq9NbTTvRJ2dLeBLPaV+hNvq2Alc7UfkKUDlLTWQjeuiC6aOnRKQQg3LZ2W25U3AlIj0jd2IPiUhg9JGV4c66XiqQ5ylTBniShfUUyeAXxbPhYFBCkBg62LZcO/tFpFsdKWtZzLjgac5vTJID+M4F8duHpkA/ZCNNUEmtt7RNQB/LLI1Gr5yR4GdQl9z7NmwtOTo9pghbZuvljr8phYjdDrwZeFTMKQnvR1l2Eh/dZ8I0C4nP5Bk4QEfmLq666P1HzOxwT6iCU6Tc+P/pkWbrx0HJh39E1aKGyLJMQIDAQAB" dork = "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAziwoHJbM1rmeUiIXOgg0cujTL5BFW9PQOksUhKza1XpDP2rpzTlQr21NFYMJMc08xiE3AbvScMTX0jX3gc7+XoIYLD1VigRRvkyTubVfRmatqj+Pk41Fle1jWXHv5vNIYjjcsUTrpnrXYKoYrz34TtsmYHnu0G9MgmmcQGmbRU+WY+1R/ukhavlgXasfEW6r4tjLgVxQnser1Zjr80AUcu23od/+o+m6C9rDGMMnv6NIc2DOT7Ei6o60458f2Iwcpg38te22dy46A8AeGynbpB9+jF33Se0m22eKk5qZN5mfju/wxWMsl7ifCY/eqLZXRxJaEd5bMI8px5KvZp1TWwIDAQAB" - kittywitch = "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApdmyA2+/si8UV3bodFZhtv5y68QnYr/kk9wnDHnk3JfJKusbrctXfETVu/9GXQ/U8tRquesF7aXKYHM/K3O6H58gAgIFm8JVnr9EUFh5PWBTKJxHgDo/6pprhpdAJg8k4f4p5yvqE0nUI6TC0UpN+ZmQMimgxvGGwQ6mpl7qmc7JxmTOiJbO1yz6eokU27S0NHfpdiE3TGG93i2r/LwAnHuhT/4weGO+vcXwKRTFGFFjvMo0XgjL2JnP01nk6dpDFwkkt5I26J4DkuNMkLefgDiGOoxDmG5EgPu0YwAm7Vk2/kX0W6rLe16lHGDkB0/atQ/IB9uch31GQrLP9etmdwIDAQAB" + kittywitch = "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApdmyA2+/si8UV3bodFZhtv5y68QnYr/kk9wnDHnk3JfJKusbrctXfETVu/9GXQ/U8tRquesF7aXKYHM/K3O6H58gAgIFm8JVnr9EUFh5PWBTKJxHgDo/6pprhpdAJg8k4f4p5yvqE0nUI6TC0UpN+ZmQMimgxvGGwQ6mpl7qmc7JxmTOiJbO1yz6eokU27S0NHfpdiE3TGG93i2r/LwAnHuhT/4weGO+vcXwKRTFGFFjvMo0XgjL2JnP01nk6dpDFwkkt5I26J4DkuNMkLefgDiGOoxDmG5EgPu0YwAm7Vk2/kX0W6rLe16lHGDkB0/atQ/IB9uch31GQrLP9etmdwIDAQAB" } } @@ -26,4 +26,4 @@ module "kittywitch-gmail" { zone_id = local.zone_ids.kittywitch zone_name = local.zones.kittywitch dkim = local.dkims.kittywitch -} \ No newline at end of file +} diff --git a/hcloud-network.tf b/tf/hcloud-network.tf similarity index 100% rename from hcloud-network.tf rename to tf/hcloud-network.tf diff --git a/hcloud-provider.tf b/tf/hcloud.tf similarity index 100% rename from hcloud-provider.tf rename to tf/hcloud.tf diff --git a/cf-inskip.me-pages.tf b/tf/inskip-pages.tf similarity index 100% rename from cf-inskip.me-pages.tf rename to tf/inskip-pages.tf diff --git a/cf-kittywit.ch-bluesky.tf b/tf/kw-bluesky.tf similarity index 100% rename from cf-kittywit.ch-bluesky.tf rename to tf/kw-bluesky.tf diff --git a/cf-kittywit.ch-pages.tf b/tf/kw-pages.tf similarity index 100% rename from cf-kittywit.ch-pages.tf rename to tf/kw-pages.tf diff --git a/cf-kittywit.ch-vault.tf b/tf/kw-vaultwarden.tf similarity index 100% rename from cf-kittywit.ch-vault.tf rename to tf/kw-vaultwarden.tf diff --git a/outputs.tf b/tf/outputs.tf similarity index 100% rename from outputs.tf rename to tf/outputs.tf diff --git a/tailscale-dns-interface.tf b/tf/tailscale-dns-interface.tf similarity index 100% rename from tailscale-dns-interface.tf rename to tf/tailscale-dns-interface.tf diff --git a/tailscale-provider.tf b/tf/tailscale.tf similarity index 100% rename from tailscale-provider.tf rename to tf/tailscale.tf diff --git a/terraform.tf b/tf/terraform.tf similarity index 100% rename from terraform.tf rename to tf/terraform.tf diff --git a/yukari-cf.tf b/tf/yukari-cf.tf similarity index 100% rename from yukari-cf.tf rename to tf/yukari-cf.tf diff --git a/yukari-hcloud.tf b/tf/yukari-hcloud.tf similarity index 100% rename from yukari-hcloud.tf rename to tf/yukari-hcloud.tf