Merge branch 'master' of github.com:nix-community/infra into master

nix/sources.json

@@ -5,10 +5,10 @@
         "homepage": "https://github.com/timokau/marvin-mk2",
         "owner": "timokau",
         "repo": "marvin-mk2",
-        "rev": "7d71609b6104e45f83b2d0d640f5185bf7965811",
-        "sha256": "12rnyn70ggcxa6fbig8bylnxcxn3mplmw03ax3x1r63zlmb9j0rn",
+        "rev": "34c1b7fa98dd48044c4819f84f5fc98617a8c49b",
+        "sha256": "1hbpxj2j7qbrvddnc20wjpm2n8k1mfgfnsihlbla4hcm8cj3y00k",
         "type": "tarball",
-        "url": "https://github.com/timokau/marvin-mk2/archive/7d71609b6104e45f83b2d0d640f5185bf7965811.tar.gz",
+        "url": "https://github.com/timokau/marvin-mk2/archive/34c1b7fa98dd48044c4819f84f5fc98617a8c49b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {

terraform/cloudflare_withnix.tf

@@ -1,27 +0,0 @@
-locals {
-  withnix_zone_id = "8fe4b50895da017367d60afd75769bd7"
-}
-
-resource "cloudflare_record" "withnix-A" {
-  zone_id = local.withnix_zone_id
-  name    = "@"
-  value   = "nix-community.github.io"
-  type    = "CNAME"
-  proxied = false
-}
-
-resource "cloudflare_record" "withnix-www-A" {
-  zone_id = local.withnix_zone_id
-  name    = "www"
-  value   = "nix-community.github.io"
-  type    = "CNAME"
-  proxied = false
-}
-
-# Any email coming from that domain are SPAM
-resource "cloudflare_record" "withnix-TXT" {
-  zone_id = local.withnix_zone_id
-  name    = "@"
-  value   = "v=spf1 -all"
-  type    = "TXT"
-}