Merge pull request #525 from NixOS/merge-bot

add staging mergebot
NixOS · Dec 30, 2024 · 0a0e186 · 0a0e186
2 parents 2347389 + 902dea9
commit 0a0e186
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/terraform/dns.tf b/terraform/dns.tf
@@ -321,6 +321,22 @@ locals {
       type     = "A"
       value    = "37.27.11.42"
     },
+    {
+      hostname = "nixpkgs-merge-bot.nixos.org"
+      type     = "AAAA"
+      value    = "2a01:4f9:c012:7615::1"
+    },
+    # nixpkgs-merge-bot-staging.nixos.org is currently hosted by helsinki systems
+    {
+      hostname = "nixpkgs-merge-bot-staging.nixos.org"
+      type     = "A"
+      value    = "37.27.197.11"
+    },
+    {
+      hostname = "nixpkgs-merge-bot-staging.nixos.org"
+      type     = "AAAA"
+      value    = "2a01:4f9:c010:dd30::1"
+    },
     {
       hostname = "umbriel.nixos.org"
       type     = "A"