From f77e8f44f7a50a6978bf591107e4aad54d4f9340 Mon Sep 17 00:00:00 2001
From: niten <niten@fudo.org>
Date: Thu, 20 Jan 2022 09:22:34 -0800
Subject: [PATCH] Changes for local site

---
 domains/fudo.org.nix     |  3 +-
 domains/sea.fudo.org.nix |  5 +--
 sites/seattle.nix        |  3 +-
 zones/fudo.org.nix       |  7 ++--
 zones/sea.fudo.org.nix   | 76 ++++++++++++++++++++--------------------
 5 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/domains/fudo.org.nix b/domains/fudo.org.nix
index d97ceac..aa58333 100644
--- a/domains/fudo.org.nix
+++ b/domains/fudo.org.nix
@@ -2,7 +2,8 @@
   local-networks = [
     "208.81.1.128/28"
     "208.81.3.112/28"
-    "91.229.23.204/31"
+    "91.229.23.204/32"
+    "199.87.154.175/32"
   ];
 
   local-users = [ "niten" "reaper" ];
diff --git a/domains/sea.fudo.org.nix b/domains/sea.fudo.org.nix
index c6e4e35..4725335 100644
--- a/domains/sea.fudo.org.nix
+++ b/domains/sea.fudo.org.nix
@@ -1,14 +1,11 @@
 {
+  # Check <fudo-nixos>/config/domain-config/sea.fudo.org.nix for more
   local-networks = [
     "10.0.0.0/16"
-    "208.81.1.128/28"
-    "208.81.3.112/28"
-
   ];
 
   local-users = [ "niten" "reaper" "xiaoxuan" "ken" ];
   local-groups = [ "fudo" "selby" "admin" ];
   local-admins = [ "niten" ];
   admin-email = "niten@fudo.org";
-  gssapi-realm = "FUDO.ORG";
 }
diff --git a/sites/seattle.nix b/sites/seattle.nix
index 0a26955..c1b468c 100644
--- a/sites/seattle.nix
+++ b/sites/seattle.nix
@@ -1,8 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-  gateway-v4 = "10.0.0.1";
-  nameservers = [ "10.0.0.1" ];
   network = "10.0.0.0/16";
   dynamic-network = "10.0.100.0/24";
   timezone = "America/Los_Angeles";
@@ -12,4 +10,5 @@
   ];
   enable-distributed-builds = false;
   mail-server = "mail.fudo.org";
+  local-gateway = "limina";
 }
diff --git a/zones/fudo.org.nix b/zones/fudo.org.nix
index 3aff75e..7ff9779 100644
--- a/zones/fudo.org.nix
+++ b/zones/fudo.org.nix
@@ -12,9 +12,7 @@
     de = "germany.fudo.org.";
     fr = "france.fudo.org.";
     git = "france.fudo.org.";
-    # metrics = "france.fudo.org.";
     minecraft = "france.fudo.org.";
-    # monitor = "france.fudo.org.";
     niten = "user.fudo.org";
     reaper = "user.fudo.org";
     src = "git.fudo.org";
@@ -29,6 +27,11 @@
     whm2 = "whm2.100percenthost.net.";
     whm3 = "whm3.100percenthost.net.";
     whm4 = "whm4.100percenthost.net.";
+
+    metrics = "nutboy3.fudo.org.";
+    monitor = "nutboy3.fudo.org.";
+    metrics-0 = "nutboy3.fudo.org.";
+    monitor-0 = "nutboy3.fudo.org.";
   };
 
   srv-records = {
diff --git a/zones/sea.fudo.org.nix b/zones/sea.fudo.org.nix
index 6b2db6e..7438068 100644
--- a/zones/sea.fudo.org.nix
+++ b/zones/sea.fudo.org.nix
@@ -2,61 +2,61 @@ let local-domain = "sea.fudo.org";
 in {
   aliases = {
     deploy = "socrates";
-    dns-hole = "limina";
-    gateway = "limina";
-    hole = "limina";
+    #dns-hole = "limina";
+    #gateway = "limina";
+    #hole = "limina";
     ipfs = "nostromo";
     # kadmin = "nostromo";
     # kdc = "nostromo";
     music = "doraemon";
-    panopticon = "lambda";
-    panopticon-od = "lambda";
+    #panopticon = "lambda";
+    #panopticon-od = "lambda";
     photo = "doraemon";
-    pihole = "limina";
+    #pihole = "limina";
     sea-store = "nostromo";
   };
 
   srv-records = {
     tcp = {
-      domain = [{
-        port = 53;
-        host = "limina.sea.fudo.org";
-      }];
-      kerberos = [{
-        port = 88;
-        host = "france.fudo.org";
-      }];
-      kerberos-adm = [{
-        port = 88;
-        host = "france.fudo.org";
-      }];
+      # domain = [{
+      #   port = 53;
+      #   host = "limina.sea.fudo.org";
+      # }];
+      # kerberos = [{
+      #   port = 88;
+      #   host = "france.fudo.org";
+      # }];
+      # kerberos-adm = [{
+      #   port = 88;
+      #   host = "france.fudo.org";
+      # }];
       ssh = [{
         port = 22;
         host = "limina.sea.fudo.org";
       }];
-      ldap = [{
-        port = 389;
-        host = "france.fudo.org";
-      }];
+      # ldap = [{
+      #   port = 389;
+      #   host = "france.fudo.org";
+      # }];
     };
 
     udp = {
-      domain = [{
-        port = 53;
-        host = "limina.sea.fudo.org";
-      }];
-      kerberos = [{
-        port = 88;
-        host = "france.fudo.org";
-      }];
-      kerboros-master = [{
-        port = 88;
-        host = "france.fudo.org";
-      }];
-      kpasswd = [{
-        port = 464;
-        host = "france.fudo.org";
-      }];
+      # domain = [{
+      #   port = 53;
+      #   host = "limina.sea.fudo.org";
+      # }];
+      # kerberos = [{
+      #   port = 88;
+      #   host = "france.fudo.org";
+      # }];
+      # kerboros-master = [{
+      #   port = 88;
+      #   host = "france.fudo.org";
+      # }];
+      # kpasswd = [{
+      #   port = 464;
+      #   host = "france.fudo.org";
+      # }];
     };
   };