bgpwtf: edge01: add new client networks, remove old q3k network, limit nscd

Batch of small changes. Already deployed.

Change-Id: Ieb4f418699f497c7013e617fd7d1827e71a7a415
diff --git a/bgpwtf/machines/edge01.waw.bgp.wtf.nix b/bgpwtf/machines/edge01.waw.bgp.wtf.nix
index d2af15e..98edb90 100644
--- a/bgpwtf/machines/edge01.waw.bgp.wtf.nix
+++ b/bgpwtf/machines/edge01.waw.bgp.wtf.nix
@@ -327,19 +327,6 @@
         reject;
       '';
     };
-    "waw_q3k" = {
-      description = "AGGREGATE CUSTOMER q3k";
-      table = "internet";
-      local = "185.236.240.64";
-      asn = 204880;
-      neighbors = [
-        { address = "185.236.240.65"; asn = 208521; }
-      ];
-      filterIn = ''
-        if net ~ [ 185.236.241.0/24 ] then accept;
-        reject;
-      '';
-    };
     # backup LTE link to edge01.fra
     "fra_edge01" = {
       description = "IBGP edge01.fra";
diff --git a/bgpwtf/machines/modules/router.nix b/bgpwtf/machines/modules/router.nix
index 88ad004..bdd5336 100644
--- a/bgpwtf/machines/modules/router.nix
+++ b/bgpwtf/machines/modules/router.nix
@@ -37,6 +37,10 @@
   boot.kernel.sysctl."net.ipv6.conf.*.router_solicitations" = 0;
   boot.kernel.sysctl."net.ipv6.route.max_size" = 2147483647;
 
+  # Limit nscd memory usage, as it sometimes just blows up and the OOMkiller
+  # sucks at picking it up.
+  systemd.services.nscd.serviceConfig.MemoryMax = "1G";
+
   # enable coredumpctl
   systemd.coredump.enable = true;
 
diff --git a/bgpwtf/machines/secrets/cipher/edge01.waw.bgp.wtf-private.nix b/bgpwtf/machines/secrets/cipher/edge01.waw.bgp.wtf-private.nix
index aea2b80..4eace24 100644
--- a/bgpwtf/machines/secrets/cipher/edge01.waw.bgp.wtf-private.nix
+++ b/bgpwtf/machines/secrets/cipher/edge01.waw.bgp.wtf-private.nix
@@ -1,51 +1,54 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-=nGiW
+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
+=HhUX
 -----END PGP MESSAGE-----